diff --git a/test cases/failing/100 bool in combo/test.json b/test cases/failing/100 bool in combo/test.json
deleted file mode 100644
index 357d7a8..0000000
--- a/test cases/failing/100 bool in combo/test.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "stdout": [
-    { "line": "test cases/failing/100 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
-  ]
-}
diff --git a/test cases/failing/101 compiler no lang/meson.build b/test cases/failing/100 compiler no lang/meson.build
similarity index 100%
rename from test cases/failing/101 compiler no lang/meson.build
rename to test cases/failing/100 compiler no lang/meson.build
diff --git a/test cases/failing/101 compiler no lang/test.json b/test cases/failing/100 compiler no lang/test.json
similarity index 66%
rename from test cases/failing/101 compiler no lang/test.json
rename to test cases/failing/100 compiler no lang/test.json
index 364efa9..935d79d 100644
--- a/test cases/failing/101 compiler no lang/test.json
+++ b/test cases/failing/100 compiler no lang/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/101 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
+      "line": "test cases/failing/100 compiler no lang/meson.build:2:6: ERROR: Tried to access compiler for language \"c\", not specified for host machine."
     }
   ]
 }
diff --git a/test cases/failing/102 no fallback/meson.build b/test cases/failing/101 no fallback/meson.build
similarity index 100%
rename from test cases/failing/102 no fallback/meson.build
rename to test cases/failing/101 no fallback/meson.build
diff --git a/test cases/failing/102 no fallback/subprojects/foob/meson.build b/test cases/failing/101 no fallback/subprojects/foob/meson.build
similarity index 100%
rename from test cases/failing/102 no fallback/subprojects/foob/meson.build
rename to test cases/failing/101 no fallback/subprojects/foob/meson.build
diff --git a/test cases/failing/102 no fallback/test.json b/test cases/failing/101 no fallback/test.json
similarity index 100%
rename from test cases/failing/102 no fallback/test.json
rename to test cases/failing/101 no fallback/test.json
diff --git a/test cases/failing/103 feature require/meson.build b/test cases/failing/102 feature require/meson.build
similarity index 100%
rename from test cases/failing/103 feature require/meson.build
rename to test cases/failing/102 feature require/meson.build
diff --git a/test cases/failing/103 feature require/meson_options.txt b/test cases/failing/102 feature require/meson_options.txt
similarity index 100%
rename from test cases/failing/103 feature require/meson_options.txt
rename to test cases/failing/102 feature require/meson_options.txt
diff --git a/test cases/failing/103 feature require/test.json b/test cases/failing/102 feature require/test.json
similarity index 100%
rename from test cases/failing/103 feature require/test.json
rename to test cases/failing/102 feature require/test.json
diff --git a/test cases/failing/104 feature require.bis/meson.build b/test cases/failing/103 feature require.bis/meson.build
similarity index 100%
rename from test cases/failing/104 feature require.bis/meson.build
rename to test cases/failing/103 feature require.bis/meson.build
diff --git a/test cases/failing/104 feature require.bis/meson_options.txt b/test cases/failing/103 feature require.bis/meson_options.txt
similarity index 100%
rename from test cases/failing/104 feature require.bis/meson_options.txt
rename to test cases/failing/103 feature require.bis/meson_options.txt
diff --git a/test cases/failing/104 feature require.bis/test.json b/test cases/failing/103 feature require.bis/test.json
similarity index 100%
rename from test cases/failing/104 feature require.bis/test.json
rename to test cases/failing/103 feature require.bis/test.json
diff --git a/test cases/failing/105 no build get_external_property/meson.build b/test cases/failing/104 no build get_external_property/meson.build
similarity index 100%
rename from test cases/failing/105 no build get_external_property/meson.build
rename to test cases/failing/104 no build get_external_property/meson.build
diff --git a/test cases/failing/105 no build get_external_property/test.json b/test cases/failing/104 no build get_external_property/test.json
similarity index 63%
rename from test cases/failing/105 no build get_external_property/test.json
rename to test cases/failing/104 no build get_external_property/test.json
index e8b282c..5792213 100644
--- a/test cases/failing/105 no build get_external_property/test.json
+++ b/test cases/failing/104 no build get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/105 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
+      "line": "test cases/failing/104 no build get_external_property/meson.build:3:14: ERROR: Unknown property for build machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/106 enter subdir twice/meson.build b/test cases/failing/105 enter subdir twice/meson.build
similarity index 100%
rename from test cases/failing/106 enter subdir twice/meson.build
rename to test cases/failing/105 enter subdir twice/meson.build
diff --git a/test cases/failing/106 enter subdir twice/sub/meson.build b/test cases/failing/105 enter subdir twice/sub/meson.build
similarity index 100%
rename from test cases/failing/106 enter subdir twice/sub/meson.build
rename to test cases/failing/105 enter subdir twice/sub/meson.build
diff --git a/test cases/failing/106 enter subdir twice/test.json b/test cases/failing/105 enter subdir twice/test.json
similarity index 64%
rename from test cases/failing/106 enter subdir twice/test.json
rename to test cases/failing/105 enter subdir twice/test.json
index 9a8b11d..80e8c10 100644
--- a/test cases/failing/106 enter subdir twice/test.json
+++ b/test cases/failing/105 enter subdir twice/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/106 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
+      "line": "test cases/failing/105 enter subdir twice/meson.build:3:0: ERROR: Tried to enter directory \"sub\", which has already been visited."
     }
   ]
 }
diff --git a/test cases/failing/107 invalid fstring/109 invalid fstring/meson.build b/test cases/failing/106 invalid fstring/109 invalid fstring/meson.build
similarity index 100%
rename from test cases/failing/107 invalid fstring/109 invalid fstring/meson.build
rename to test cases/failing/106 invalid fstring/109 invalid fstring/meson.build
diff --git a/test cases/failing/107 invalid fstring/109 invalid fstring/test.json b/test cases/failing/106 invalid fstring/109 invalid fstring/test.json
similarity index 100%
rename from test cases/failing/107 invalid fstring/109 invalid fstring/test.json
rename to test cases/failing/106 invalid fstring/109 invalid fstring/test.json
diff --git a/test cases/failing/107 invalid fstring/meson.build b/test cases/failing/106 invalid fstring/meson.build
similarity index 100%
rename from test cases/failing/107 invalid fstring/meson.build
rename to test cases/failing/106 invalid fstring/meson.build
diff --git a/test cases/failing/107 invalid fstring/test.json b/test cases/failing/106 invalid fstring/test.json
similarity index 63%
rename from test cases/failing/107 invalid fstring/test.json
rename to test cases/failing/106 invalid fstring/test.json
index ccd82b5..8d53428 100644
--- a/test cases/failing/107 invalid fstring/test.json
+++ b/test cases/failing/106 invalid fstring/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/107 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
+            "line": "test cases/failing/106 invalid fstring/meson.build:3:4: ERROR: Identifier \"foo\" does not name a variable."
         }
     ]
 }
diff --git a/test cases/failing/108 compiler argument checking/meson.build b/test cases/failing/107 compiler argument checking/meson.build
similarity index 100%
rename from test cases/failing/108 compiler argument checking/meson.build
rename to test cases/failing/107 compiler argument checking/meson.build
diff --git a/test cases/failing/108 compiler argument checking/test.json b/test cases/failing/107 compiler argument checking/test.json
similarity index 66%
rename from test cases/failing/108 compiler argument checking/test.json
rename to test cases/failing/107 compiler argument checking/test.json
index e9e27af..a1576aa 100644
--- a/test cases/failing/108 compiler argument checking/test.json
+++ b/test cases/failing/107 compiler argument checking/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-        "line": "test cases/failing/108 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
+        "line": "test cases/failing/107 compiler argument checking/meson.build:4:25: ERROR: Compiler for C does not support \"-meson-goober-arg-for-testing\""
     }
   ]
 }
diff --git a/test cases/failing/109 empty fallback/meson.build b/test cases/failing/108 empty fallback/meson.build
similarity index 100%
rename from test cases/failing/109 empty fallback/meson.build
rename to test cases/failing/108 empty fallback/meson.build
diff --git a/test cases/failing/109 empty fallback/subprojects/foo/meson.build b/test cases/failing/108 empty fallback/subprojects/foo/meson.build
similarity index 100%
rename from test cases/failing/109 empty fallback/subprojects/foo/meson.build
rename to test cases/failing/108 empty fallback/subprojects/foo/meson.build
diff --git a/test cases/failing/109 empty fallback/test.json b/test cases/failing/108 empty fallback/test.json
similarity index 66%
rename from test cases/failing/109 empty fallback/test.json
rename to test cases/failing/108 empty fallback/test.json
index 46a4ec5..c631882 100644
--- a/test cases/failing/109 empty fallback/test.json
+++ b/test cases/failing/108 empty fallback/test.json
@@ -2,7 +2,7 @@
     "stdout": [
         {
             "match": "re",
-            "line": "test cases/failing/109 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
+            "line": "test cases/failing/108 empty fallback/meson.build:6:0: ERROR: Dependency \"foo\" not found.*"
         }
     ]
 }
diff --git a/test cases/failing/110 cmake executable dependency/meson.build b/test cases/failing/109 cmake executable dependency/meson.build
similarity index 100%
rename from test cases/failing/110 cmake executable dependency/meson.build
rename to test cases/failing/109 cmake executable dependency/meson.build
diff --git a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
similarity index 100%
rename from test cases/failing/110 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
rename to test cases/failing/109 cmake executable dependency/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c b/test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c
similarity index 100%
rename from test cases/failing/110 cmake executable dependency/subprojects/cmlib/main.c
rename to test cases/failing/109 cmake executable dependency/subprojects/cmlib/main.c
diff --git a/test cases/failing/110 cmake executable dependency/test.json b/test cases/failing/109 cmake executable dependency/test.json
similarity index 77%
rename from test cases/failing/110 cmake executable dependency/test.json
rename to test cases/failing/109 cmake executable dependency/test.json
index 80d01fe..f7c4775 100644
--- a/test cases/failing/110 cmake executable dependency/test.json
+++ b/test cases/failing/109 cmake executable dependency/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/110 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
+            "line": "test cases/failing/109 cmake executable dependency/meson.build:9:14: ERROR: main is an executable and does not support the dependency() method. Use target() instead."
         }
     ],
     "tools": {
diff --git a/test cases/failing/111 allow_fallback with fallback/meson.build b/test cases/failing/110 allow_fallback with fallback/meson.build
similarity index 100%
rename from test cases/failing/111 allow_fallback with fallback/meson.build
rename to test cases/failing/110 allow_fallback with fallback/meson.build
diff --git a/test cases/failing/111 allow_fallback with fallback/test.json b/test cases/failing/110 allow_fallback with fallback/test.json
similarity index 70%
rename from test cases/failing/111 allow_fallback with fallback/test.json
rename to test cases/failing/110 allow_fallback with fallback/test.json
index 92aa19a..b558ecc 100644
--- a/test cases/failing/111 allow_fallback with fallback/test.json
+++ b/test cases/failing/110 allow_fallback with fallback/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/111 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
+            "line": "test cases/failing/110 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive"
         }
     ]
 }
diff --git a/test cases/failing/112 nonsensical bindgen/meson.build b/test cases/failing/111 nonsensical bindgen/meson.build
similarity index 100%
rename from test cases/failing/112 nonsensical bindgen/meson.build
rename to test cases/failing/111 nonsensical bindgen/meson.build
diff --git a/test cases/failing/112 nonsensical bindgen/src/header.h b/test cases/failing/111 nonsensical bindgen/src/header.h
similarity index 100%
rename from test cases/failing/112 nonsensical bindgen/src/header.h
rename to test cases/failing/111 nonsensical bindgen/src/header.h
diff --git a/test cases/failing/112 nonsensical bindgen/src/source.c b/test cases/failing/111 nonsensical bindgen/src/source.c
similarity index 100%
rename from test cases/failing/112 nonsensical bindgen/src/source.c
rename to test cases/failing/111 nonsensical bindgen/src/source.c
diff --git a/test cases/failing/112 nonsensical bindgen/test.json b/test cases/failing/111 nonsensical bindgen/test.json
similarity index 69%
rename from test cases/failing/112 nonsensical bindgen/test.json
rename to test cases/failing/111 nonsensical bindgen/test.json
index a2b4b71..f2dc92c 100644
--- a/test cases/failing/112 nonsensical bindgen/test.json
+++ b/test cases/failing/111 nonsensical bindgen/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/112 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
+            "line": "test cases/failing/111 nonsensical bindgen/meson.build:17:24: ERROR: bindgen source file must be a C header, not an object or build target"
         }
     ]
 }
diff --git a/test cases/failing/113 run_target in test/meson.build b/test cases/failing/112 run_target in test/meson.build
similarity index 100%
rename from test cases/failing/113 run_target in test/meson.build
rename to test cases/failing/112 run_target in test/meson.build
diff --git a/test cases/failing/113 run_target in test/test.json b/test cases/failing/112 run_target in test/test.json
similarity index 77%
rename from test cases/failing/113 run_target in test/test.json
rename to test cases/failing/112 run_target in test/test.json
index 0e1ded4..100db94 100644
--- a/test cases/failing/113 run_target in test/test.json
+++ b/test cases/failing/112 run_target in test/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/113 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
+            "line": "test cases/failing/112 run_target in test/meson.build:7:0: ERROR: test keyword argument 'args' was of type array[RunTarget] but should have been array[str | File | BuildTarget | CustomTarget | CustomTargetIndex]"
         }
     ]
 }
diff --git a/test cases/failing/113 run_target in test/trivial.c b/test cases/failing/112 run_target in test/trivial.c
similarity index 100%
rename from test cases/failing/113 run_target in test/trivial.c
rename to test cases/failing/112 run_target in test/trivial.c
diff --git a/test cases/failing/114 run_target in add_install_script/meson.build b/test cases/failing/113 run_target in add_install_script/meson.build
similarity index 100%
rename from test cases/failing/114 run_target in add_install_script/meson.build
rename to test cases/failing/113 run_target in add_install_script/meson.build
diff --git a/test cases/failing/114 run_target in add_install_script/test.json b/test cases/failing/113 run_target in add_install_script/test.json
similarity index 80%
rename from test cases/failing/114 run_target in add_install_script/test.json
rename to test cases/failing/113 run_target in add_install_script/test.json
index 0b28f9b..c9ed33e 100644
--- a/test cases/failing/114 run_target in add_install_script/test.json
+++ b/test cases/failing/113 run_target in add_install_script/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/114 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
+            "line": "test cases/failing/113 run_target in add_install_script/meson.build:7:6: ERROR: meson.add_install_script argument 2 was of type \"RunTarget\" but should have been one of: \"str\", \"File\", \"BuildTarget\", \"CustomTarget\", \"CustomTargetIndex\", \"ExternalProgram\""
         }
     ]
 }
diff --git a/test cases/failing/114 run_target in add_install_script/trivial.c b/test cases/failing/113 run_target in add_install_script/trivial.c
similarity index 100%
rename from test cases/failing/114 run_target in add_install_script/trivial.c
rename to test cases/failing/113 run_target in add_install_script/trivial.c
diff --git a/test cases/failing/115 pathsep in install_symlink/meson.build b/test cases/failing/114 pathsep in install_symlink/meson.build
similarity index 100%
rename from test cases/failing/115 pathsep in install_symlink/meson.build
rename to test cases/failing/114 pathsep in install_symlink/meson.build
diff --git a/test cases/failing/115 pathsep in install_symlink/test.json b/test cases/failing/114 pathsep in install_symlink/test.json
similarity index 74%
rename from test cases/failing/115 pathsep in install_symlink/test.json
rename to test cases/failing/114 pathsep in install_symlink/test.json
index fee661f..bca4e0e 100644
--- a/test cases/failing/115 pathsep in install_symlink/test.json
+++ b/test cases/failing/114 pathsep in install_symlink/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/115 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
+            "line": "test cases/failing/114 pathsep in install_symlink/meson.build:3:0: ERROR: Link name is \"foo/bar\", but link names cannot contain path separators. The dir part should be in install_dir."
         }
     ]
 }
diff --git a/test cases/failing/116 subproject version conflict/meson.build b/test cases/failing/115 subproject version conflict/meson.build
similarity index 100%
rename from test cases/failing/116 subproject version conflict/meson.build
rename to test cases/failing/115 subproject version conflict/meson.build
diff --git a/test cases/failing/116 subproject version conflict/subprojects/A/meson.build b/test cases/failing/115 subproject version conflict/subprojects/A/meson.build
similarity index 100%
rename from test cases/failing/116 subproject version conflict/subprojects/A/meson.build
rename to test cases/failing/115 subproject version conflict/subprojects/A/meson.build
diff --git a/test cases/failing/116 subproject version conflict/subprojects/B/meson.build b/test cases/failing/115 subproject version conflict/subprojects/B/meson.build
similarity index 100%
rename from test cases/failing/116 subproject version conflict/subprojects/B/meson.build
rename to test cases/failing/115 subproject version conflict/subprojects/B/meson.build
diff --git a/test cases/failing/116 subproject version conflict/test.json b/test cases/failing/115 subproject version conflict/test.json
similarity index 66%
rename from test cases/failing/116 subproject version conflict/test.json
rename to test cases/failing/115 subproject version conflict/test.json
index c827744..23c7eb5 100644
--- a/test cases/failing/116 subproject version conflict/test.json
+++ b/test cases/failing/115 subproject version conflict/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/116 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
+            "line": "test cases/failing/115 subproject version conflict/meson.build:4:8: ERROR: Subproject B version is 100 but ['1'] required."
         }
     ]
 }
diff --git a/test cases/failing/117 structured source empty string/main.rs b/test cases/failing/116 structured source empty string/main.rs
similarity index 100%
rename from test cases/failing/117 structured source empty string/main.rs
rename to test cases/failing/116 structured source empty string/main.rs
diff --git a/test cases/failing/117 structured source empty string/meson.build b/test cases/failing/116 structured source empty string/meson.build
similarity index 100%
rename from test cases/failing/117 structured source empty string/meson.build
rename to test cases/failing/116 structured source empty string/meson.build
diff --git a/test cases/failing/117 structured source empty string/test.json b/test cases/failing/116 structured source empty string/test.json
similarity index 71%
rename from test cases/failing/117 structured source empty string/test.json
rename to test cases/failing/116 structured source empty string/test.json
index 7c90b03..00efbe3 100644
--- a/test cases/failing/117 structured source empty string/test.json
+++ b/test cases/failing/116 structured source empty string/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/117 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
+            "line": "test cases/failing/116 structured source empty string/meson.build:9:2: ERROR: structured_sources: keys to dictionary argument may not be an empty string."
         }
     ]
 }
diff --git a/test cases/failing/118 structured_sources conflicts/main.rs b/test cases/failing/117 structured_sources conflicts/main.rs
similarity index 100%
rename from test cases/failing/118 structured_sources conflicts/main.rs
rename to test cases/failing/117 structured_sources conflicts/main.rs
diff --git a/test cases/failing/118 structured_sources conflicts/meson.build b/test cases/failing/117 structured_sources conflicts/meson.build
similarity index 100%
rename from test cases/failing/118 structured_sources conflicts/meson.build
rename to test cases/failing/117 structured_sources conflicts/meson.build
diff --git a/test cases/failing/118 structured_sources conflicts/test.json b/test cases/failing/117 structured_sources conflicts/test.json
similarity index 67%
rename from test cases/failing/118 structured_sources conflicts/test.json
rename to test cases/failing/117 structured_sources conflicts/test.json
index 55b1228..a7201b5 100644
--- a/test cases/failing/118 structured_sources conflicts/test.json
+++ b/test cases/failing/117 structured_sources conflicts/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/118 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
+            "line": "test cases/failing/117 structured_sources conflicts/meson.build:7:0: ERROR: Conflicting sources in structured sources: main.rs"
         }
     ]
 }
diff --git a/test cases/failing/119 missing compiler/meson.build b/test cases/failing/118 missing compiler/meson.build
similarity index 100%
rename from test cases/failing/119 missing compiler/meson.build
rename to test cases/failing/118 missing compiler/meson.build
diff --git a/test cases/failing/119 missing compiler/subprojects/sub/main.c b/test cases/failing/118 missing compiler/subprojects/sub/main.c
similarity index 100%
rename from test cases/failing/119 missing compiler/subprojects/sub/main.c
rename to test cases/failing/118 missing compiler/subprojects/sub/main.c
diff --git a/test cases/failing/119 missing compiler/subprojects/sub/meson.build b/test cases/failing/118 missing compiler/subprojects/sub/meson.build
similarity index 100%
rename from test cases/failing/119 missing compiler/subprojects/sub/meson.build
rename to test cases/failing/118 missing compiler/subprojects/sub/meson.build
diff --git a/test cases/failing/119 missing compiler/test.json b/test cases/failing/118 missing compiler/test.json
similarity index 68%
rename from test cases/failing/119 missing compiler/test.json
rename to test cases/failing/118 missing compiler/test.json
index c5f3fb1..a2494e4 100644
--- a/test cases/failing/119 missing compiler/test.json
+++ b/test cases/failing/118 missing compiler/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/119 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
+            "line": "test cases/failing/118 missing compiler/subprojects/sub/meson.build:4:0: ERROR: No host machine compiler for 'subprojects/sub/main.c'"
         }
     ]
 }
diff --git a/test cases/failing/120 cmake subproject error/meson.build b/test cases/failing/119 cmake subproject error/meson.build
similarity index 100%
rename from test cases/failing/120 cmake subproject error/meson.build
rename to test cases/failing/119 cmake subproject error/meson.build
diff --git a/test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt b/test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt
similarity index 100%
rename from test cases/failing/120 cmake subproject error/subprojects/cmlib/CMakeLists.txt
rename to test cases/failing/119 cmake subproject error/subprojects/cmlib/CMakeLists.txt
diff --git a/test cases/failing/120 cmake subproject error/test.json b/test cases/failing/119 cmake subproject error/test.json
similarity index 74%
rename from test cases/failing/120 cmake subproject error/test.json
rename to test cases/failing/119 cmake subproject error/test.json
index d88e708..625e451 100644
--- a/test cases/failing/120 cmake subproject error/test.json
+++ b/test cases/failing/119 cmake subproject error/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
         {
-            "line": "test cases/failing/120 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
+            "line": "test cases/failing/119 cmake subproject error/meson.build:8:14: ERROR: Failed to configure the CMake subproject: Fancy error message"
         }
     ],
     "tools": {
diff --git a/test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build b/test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build
similarity index 100%
rename from test cases/failing/121 pkgconfig not relocatable outside prefix/meson.build
rename to test cases/failing/120 pkgconfig not relocatable outside prefix/meson.build
diff --git a/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json b/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json
similarity index 77%
rename from test cases/failing/121 pkgconfig not relocatable outside prefix/test.json
rename to test cases/failing/120 pkgconfig not relocatable outside prefix/test.json
index c0dfb87..32c6e09 100644
--- a/test cases/failing/121 pkgconfig not relocatable outside prefix/test.json
+++ b/test cases/failing/120 pkgconfig not relocatable outside prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/121 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
+      "line": "test cases/failing/120 pkgconfig not relocatable outside prefix/meson\\.build:17:5: ERROR: Pkgconfig prefix cannot be outside of the prefix when pkgconfig\\.relocatable=true. Pkgconfig prefix is (C:)?/opt/lib/pkgconfig.",
       "match": "re"
     }
   ]
diff --git a/test cases/failing/122 subproject sandbox violation/meson.build b/test cases/failing/121 subproject sandbox violation/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/meson.build
rename to test cases/failing/121 subproject sandbox violation/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/meson_options.txt b/test cases/failing/121 subproject sandbox violation/meson_options.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/meson_options.txt
rename to test cases/failing/121 subproject sandbox violation/meson_options.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj1/file.txt
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj1/file.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj1/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj1/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj1/nested/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj1/nested/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj2/file.txt
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj2/file.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj2/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj2/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj2/nested/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj2/nested/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj3/file.txt
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj3/file.txt
diff --git a/test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build b/test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build
similarity index 100%
rename from test cases/failing/122 subproject sandbox violation/subprojects/subproj3/meson.build
rename to test cases/failing/121 subproject sandbox violation/subprojects/subproj3/meson.build
diff --git a/test cases/failing/122 subproject sandbox violation/test.json b/test cases/failing/121 subproject sandbox violation/test.json
similarity index 82%
rename from test cases/failing/122 subproject sandbox violation/test.json
rename to test cases/failing/121 subproject sandbox violation/test.json
index 4bd4028..d8c28d7 100644
--- a/test cases/failing/122 subproject sandbox violation/test.json
+++ b/test cases/failing/121 subproject sandbox violation/test.json
@@ -10,7 +10,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/122 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
+      "line": "test cases/failing/121 subproject sandbox violation/meson.build:24:0: ERROR: Sandbox violation: Tried to grab file file.txt from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/123 override and add_project_dependency/inc/lib.h b/test cases/failing/122 override and add_project_dependency/inc/lib.h
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/inc/lib.h
rename to test cases/failing/122 override and add_project_dependency/inc/lib.h
diff --git a/test cases/failing/123 override and add_project_dependency/lib.c b/test cases/failing/122 override and add_project_dependency/lib.c
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/lib.c
rename to test cases/failing/122 override and add_project_dependency/lib.c
diff --git a/test cases/failing/123 override and add_project_dependency/meson.build b/test cases/failing/122 override and add_project_dependency/meson.build
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/meson.build
rename to test cases/failing/122 override and add_project_dependency/meson.build
diff --git a/test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build b/test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build
rename to test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build
diff --git a/test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c b/test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c
similarity index 100%
rename from test cases/failing/123 override and add_project_dependency/subprojects/a/prog.c
rename to test cases/failing/122 override and add_project_dependency/subprojects/a/prog.c
diff --git a/test cases/failing/123 override and add_project_dependency/test.json b/test cases/failing/122 override and add_project_dependency/test.json
similarity index 66%
rename from test cases/failing/123 override and add_project_dependency/test.json
rename to test cases/failing/122 override and add_project_dependency/test.json
index e0a4433..08eb0c6 100644
--- a/test cases/failing/123 override and add_project_dependency/test.json
+++ b/test cases/failing/122 override and add_project_dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/123 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
+      "line": "test cases/failing/122 override and add_project_dependency/subprojects/a/meson.build:6:0: ERROR: Dependencies must be external dependencies"
     }
   ]
 }
diff --git a/test cases/failing/124 targets before add_project_dependency/inc/lib.h b/test cases/failing/123 targets before add_project_dependency/inc/lib.h
similarity index 100%
rename from test cases/failing/124 targets before add_project_dependency/inc/lib.h
rename to test cases/failing/123 targets before add_project_dependency/inc/lib.h
diff --git a/test cases/failing/124 targets before add_project_dependency/lib.c b/test cases/failing/123 targets before add_project_dependency/lib.c
similarity index 100%
rename from test cases/failing/124 targets before add_project_dependency/lib.c
rename to test cases/failing/123 targets before add_project_dependency/lib.c
diff --git a/test cases/failing/124 targets before add_project_dependency/meson.build b/test cases/failing/123 targets before add_project_dependency/meson.build
similarity index 100%
rename from test cases/failing/124 targets before add_project_dependency/meson.build
rename to test cases/failing/123 targets before add_project_dependency/meson.build
diff --git a/test cases/failing/124 targets before add_project_dependency/test.json b/test cases/failing/123 targets before add_project_dependency/test.json
similarity index 70%
rename from test cases/failing/124 targets before add_project_dependency/test.json
rename to test cases/failing/123 targets before add_project_dependency/test.json
index d856ba4..4a21eec 100644
--- a/test cases/failing/124 targets before add_project_dependency/test.json
+++ b/test cases/failing/123 targets before add_project_dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/124 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
+      "line": "test cases/failing/123 targets before add_project_dependency/meson.build:5:0: ERROR: Tried to use 'add_project_dependencies' after a build target has been declared."
     }
   ]
 }
diff --git a/test cases/failing/125 extract from unity/meson.build b/test cases/failing/124 extract from unity/meson.build
similarity index 100%
rename from test cases/failing/125 extract from unity/meson.build
rename to test cases/failing/124 extract from unity/meson.build
diff --git a/test cases/failing/125 extract from unity/src1.c b/test cases/failing/124 extract from unity/src1.c
similarity index 100%
rename from test cases/failing/125 extract from unity/src1.c
rename to test cases/failing/124 extract from unity/src1.c
diff --git a/test cases/failing/125 extract from unity/src2.c b/test cases/failing/124 extract from unity/src2.c
similarity index 100%
rename from test cases/failing/125 extract from unity/src2.c
rename to test cases/failing/124 extract from unity/src2.c
diff --git a/test cases/failing/125 extract from unity/test.json b/test cases/failing/124 extract from unity/test.json
similarity index 73%
rename from test cases/failing/125 extract from unity/test.json
rename to test cases/failing/124 extract from unity/test.json
index 2f6468d..ef76d2f 100644
--- a/test cases/failing/125 extract from unity/test.json
+++ b/test cases/failing/124 extract from unity/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/125 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
+      "line": "test cases/failing/124 extract from unity/meson.build:4:37: ERROR: Single object files cannot be extracted in Unity builds. You can only extract all the object files for each compiler at once."
     }
   ]
 }
diff --git a/test cases/failing/126 subproject object as a dependency/main.c b/test cases/failing/125 subproject object as a dependency/main.c
similarity index 100%
rename from test cases/failing/126 subproject object as a dependency/main.c
rename to test cases/failing/125 subproject object as a dependency/main.c
diff --git a/test cases/failing/126 subproject object as a dependency/meson.build b/test cases/failing/125 subproject object as a dependency/meson.build
similarity index 100%
rename from test cases/failing/126 subproject object as a dependency/meson.build
rename to test cases/failing/125 subproject object as a dependency/meson.build
diff --git a/test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build b/test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build
similarity index 100%
rename from test cases/failing/126 subproject object as a dependency/subprojects/sub/meson.build
rename to test cases/failing/125 subproject object as a dependency/subprojects/sub/meson.build
diff --git a/test cases/failing/126 subproject object as a dependency/test.json b/test cases/failing/125 subproject object as a dependency/test.json
similarity index 64%
rename from test cases/failing/126 subproject object as a dependency/test.json
rename to test cases/failing/125 subproject object as a dependency/test.json
index 4bf7f5b..0cb2571 100644
--- a/test cases/failing/126 subproject object as a dependency/test.json
+++ b/test cases/failing/125 subproject object as a dependency/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/126 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
+      "line": "test cases/failing/125 subproject object as a dependency/meson.build:3:0: ERROR: Tried to use subproject object as a dependency."
     }
   ]
 }
diff --git a/test cases/failing/127 generator host binary/exe.c b/test cases/failing/126 generator host binary/exe.c
similarity index 100%
rename from test cases/failing/127 generator host binary/exe.c
rename to test cases/failing/126 generator host binary/exe.c
diff --git a/test cases/failing/127 generator host binary/lib.in b/test cases/failing/126 generator host binary/lib.in
similarity index 100%
rename from test cases/failing/127 generator host binary/lib.in
rename to test cases/failing/126 generator host binary/lib.in
diff --git a/test cases/failing/127 generator host binary/meson.build b/test cases/failing/126 generator host binary/meson.build
similarity index 100%
rename from test cases/failing/127 generator host binary/meson.build
rename to test cases/failing/126 generator host binary/meson.build
diff --git a/test cases/failing/127 generator host binary/test.json b/test cases/failing/126 generator host binary/test.json
similarity index 100%
rename from test cases/failing/127 generator host binary/test.json
rename to test cases/failing/126 generator host binary/test.json
diff --git a/test cases/failing/128 invalid ast/meson.build b/test cases/failing/127 invalid ast/meson.build
similarity index 100%
rename from test cases/failing/128 invalid ast/meson.build
rename to test cases/failing/127 invalid ast/meson.build
diff --git a/test cases/failing/128 invalid ast/test.json b/test cases/failing/127 invalid ast/test.json
similarity index 67%
rename from test cases/failing/128 invalid ast/test.json
rename to test cases/failing/127 invalid ast/test.json
index e5c3873..db7bfe8 100644
--- a/test cases/failing/128 invalid ast/test.json
+++ b/test cases/failing/127 invalid ast/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/128 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/127 invalid ast/meson.build:1:44: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/129 invalid project function/meson.build b/test cases/failing/128 invalid project function/meson.build
similarity index 100%
rename from test cases/failing/129 invalid project function/meson.build
rename to test cases/failing/128 invalid project function/meson.build
diff --git a/test cases/failing/129 invalid project function/test.json b/test cases/failing/128 invalid project function/test.json
similarity index 69%
rename from test cases/failing/129 invalid project function/test.json
rename to test cases/failing/128 invalid project function/test.json
index b28266c..17c1ac6 100644
--- a/test cases/failing/129 invalid project function/test.json
+++ b/test cases/failing/128 invalid project function/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/129 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
+      "line": "test cases/failing/128 invalid project function/meson.build:1:67: ERROR: Meson version is [0-9.]+(\\.rc[0-9]+)? but project requires 0.1.0"
     }
   ]
 }
diff --git a/test cases/failing/130 utf8 with bom/meson.build b/test cases/failing/129 utf8 with bom/meson.build
similarity index 100%
rename from test cases/failing/130 utf8 with bom/meson.build
rename to test cases/failing/129 utf8 with bom/meson.build
diff --git a/test cases/failing/130 utf8 with bom/test.json b/test cases/failing/129 utf8 with bom/test.json
similarity index 63%
rename from test cases/failing/130 utf8 with bom/test.json
rename to test cases/failing/129 utf8 with bom/test.json
index 2292beb..ec2df13 100644
--- a/test cases/failing/130 utf8 with bom/test.json
+++ b/test cases/failing/129 utf8 with bom/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/130 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/129 utf8 with bom/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/131 utf8 with bom subdir/meson.build b/test cases/failing/130 utf8 with bom subdir/meson.build
similarity index 100%
rename from test cases/failing/131 utf8 with bom subdir/meson.build
rename to test cases/failing/130 utf8 with bom subdir/meson.build
diff --git a/test cases/failing/131 utf8 with bom subdir/subdir/meson.build b/test cases/failing/130 utf8 with bom subdir/subdir/meson.build
similarity index 100%
rename from test cases/failing/131 utf8 with bom subdir/subdir/meson.build
rename to test cases/failing/130 utf8 with bom subdir/subdir/meson.build
diff --git a/test cases/failing/131 utf8 with bom subdir/test.json b/test cases/failing/130 utf8 with bom subdir/test.json
similarity index 66%
rename from test cases/failing/131 utf8 with bom subdir/test.json
rename to test cases/failing/130 utf8 with bom subdir/test.json
index 72cc515..bbaea1b 100644
--- a/test cases/failing/131 utf8 with bom subdir/test.json
+++ b/test cases/failing/130 utf8 with bom subdir/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/131 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/130 utf8 with bom subdir/subdir/meson.build:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/132 utf8 with bom options/meson.build b/test cases/failing/131 utf8 with bom options/meson.build
similarity index 100%
rename from test cases/failing/132 utf8 with bom options/meson.build
rename to test cases/failing/131 utf8 with bom options/meson.build
diff --git a/test cases/failing/132 utf8 with bom options/meson.options b/test cases/failing/131 utf8 with bom options/meson.options
similarity index 100%
rename from test cases/failing/132 utf8 with bom options/meson.options
rename to test cases/failing/131 utf8 with bom options/meson.options
diff --git a/test cases/failing/132 utf8 with bom options/test.json b/test cases/failing/131 utf8 with bom options/test.json
similarity index 65%
rename from test cases/failing/132 utf8 with bom options/test.json
rename to test cases/failing/131 utf8 with bom options/test.json
index c09f48e..e6391c5 100644
--- a/test cases/failing/132 utf8 with bom options/test.json
+++ b/test cases/failing/131 utf8 with bom options/test.json
@@ -1,7 +1,7 @@
 {
     "stdout": [
       {
-        "line": "test cases/failing/132 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
+        "line": "test cases/failing/131 utf8 with bom options/meson.options:0:0: ERROR: Builder file must be encoded in UTF-8 (with no BOM)"
       }
     ]
   }
diff --git a/test cases/failing/48 pkgconfig variables not key value/meson.build b/test cases/failing/47 pkgconfig variables not key value/meson.build
similarity index 100%
rename from test cases/failing/48 pkgconfig variables not key value/meson.build
rename to test cases/failing/47 pkgconfig variables not key value/meson.build
diff --git a/test cases/failing/48 pkgconfig variables not key value/simple.c b/test cases/failing/47 pkgconfig variables not key value/simple.c
similarity index 100%
rename from test cases/failing/48 pkgconfig variables not key value/simple.c
rename to test cases/failing/47 pkgconfig variables not key value/simple.c
diff --git a/test cases/failing/48 pkgconfig variables not key value/simple.h b/test cases/failing/47 pkgconfig variables not key value/simple.h
similarity index 100%
rename from test cases/failing/48 pkgconfig variables not key value/simple.h
rename to test cases/failing/47 pkgconfig variables not key value/simple.h
diff --git a/test cases/failing/48 pkgconfig variables not key value/test.json b/test cases/failing/47 pkgconfig variables not key value/test.json
similarity index 75%
rename from test cases/failing/48 pkgconfig variables not key value/test.json
rename to test cases/failing/47 pkgconfig variables not key value/test.json
index 96422a9..11cd374 100644
--- a/test cases/failing/48 pkgconfig variables not key value/test.json
+++ b/test cases/failing/47 pkgconfig variables not key value/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/48 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign."
+      "line": "test cases/failing/47 pkgconfig variables not key value/meson.build:8:5: ERROR: pkgconfig.generate keyword argument \"variables\" variable 'this_should_be_key_value' must have a value separated by equals sign."
     }
   ]
 }
diff --git a/test cases/failing/49 executable comparison/meson.build b/test cases/failing/48 executable comparison/meson.build
similarity index 100%
rename from test cases/failing/49 executable comparison/meson.build
rename to test cases/failing/48 executable comparison/meson.build
diff --git a/test cases/failing/49 executable comparison/prog.c b/test cases/failing/48 executable comparison/prog.c
similarity index 100%
rename from test cases/failing/49 executable comparison/prog.c
rename to test cases/failing/48 executable comparison/prog.c
diff --git a/test cases/failing/49 executable comparison/test.json b/test cases/failing/48 executable comparison/test.json
similarity index 73%
rename from test cases/failing/49 executable comparison/test.json
rename to test cases/failing/48 executable comparison/test.json
index 76c310b..db6dac3 100644
--- a/test cases/failing/49 executable comparison/test.json
+++ b/test cases/failing/48 executable comparison/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/49 executable comparison/meson.build:6:14: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
+      "line": "test cases/failing/48 executable comparison/meson.build:6:14: ERROR: Object <ExecutableHolder prog1@exe: prog1(.exe)?> of type Executable does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/50 inconsistent comparison/meson.build b/test cases/failing/49 inconsistent comparison/meson.build
similarity index 100%
rename from test cases/failing/50 inconsistent comparison/meson.build
rename to test cases/failing/49 inconsistent comparison/meson.build
diff --git a/test cases/failing/50 inconsistent comparison/test.json b/test cases/failing/49 inconsistent comparison/test.json
similarity index 69%
rename from test cases/failing/50 inconsistent comparison/test.json
rename to test cases/failing/49 inconsistent comparison/test.json
index fa71eef..4440a86 100644
--- a/test cases/failing/50 inconsistent comparison/test.json
+++ b/test cases/failing/49 inconsistent comparison/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/50 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
+      "line": "test cases/failing/49 inconsistent comparison/meson.build:5:12: ERROR: Object <[ArrayHolder] holds [list]: []> of type array does not support the `<` operator."
     }
   ]
 }
diff --git a/test cases/failing/51 slashname/meson.build b/test cases/failing/50 slashname/meson.build
similarity index 100%
rename from test cases/failing/51 slashname/meson.build
rename to test cases/failing/50 slashname/meson.build
diff --git a/test cases/failing/51 slashname/sub/meson.build b/test cases/failing/50 slashname/sub/meson.build
similarity index 100%
rename from test cases/failing/51 slashname/sub/meson.build
rename to test cases/failing/50 slashname/sub/meson.build
diff --git a/test cases/failing/51 slashname/sub/prog.c b/test cases/failing/50 slashname/sub/prog.c
similarity index 100%
rename from test cases/failing/51 slashname/sub/prog.c
rename to test cases/failing/50 slashname/sub/prog.c
diff --git a/test cases/failing/51 slashname/test.json b/test cases/failing/50 slashname/test.json
similarity index 67%
rename from test cases/failing/51 slashname/test.json
rename to test cases/failing/50 slashname/test.json
index 39346a9..44b566c 100644
--- a/test cases/failing/51 slashname/test.json
+++ b/test cases/failing/50 slashname/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/51 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
+      "line": "test cases/failing/50 slashname/meson.build:9:0: ERROR: Target \"sub/prog\" has a path segment pointing to directory \"sub\". This is an error."
     }
   ]
 }
diff --git a/test cases/failing/52 reserved meson prefix/meson-foo/meson.build b/test cases/failing/51 reserved meson prefix/meson-foo/meson.build
similarity index 100%
rename from test cases/failing/52 reserved meson prefix/meson-foo/meson.build
rename to test cases/failing/51 reserved meson prefix/meson-foo/meson.build
diff --git a/test cases/failing/52 reserved meson prefix/meson.build b/test cases/failing/51 reserved meson prefix/meson.build
similarity index 100%
rename from test cases/failing/52 reserved meson prefix/meson.build
rename to test cases/failing/51 reserved meson prefix/meson.build
diff --git a/test cases/failing/52 reserved meson prefix/test.json b/test cases/failing/51 reserved meson prefix/test.json
similarity index 67%
rename from test cases/failing/52 reserved meson prefix/test.json
rename to test cases/failing/51 reserved meson prefix/test.json
index 707cd73..9eb1fa4 100644
--- a/test cases/failing/52 reserved meson prefix/test.json
+++ b/test cases/failing/51 reserved meson prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/52 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
+      "line": "test cases/failing/51 reserved meson prefix/meson.build:3:0: ERROR: The \"meson-\" prefix is reserved and cannot be used for top-level subdir()."
     }
   ]
 }
diff --git a/test cases/failing/53 or on new line/meson.build b/test cases/failing/52 or on new line/meson.build
similarity index 100%
rename from test cases/failing/53 or on new line/meson.build
rename to test cases/failing/52 or on new line/meson.build
diff --git a/test cases/failing/53 or on new line/meson_options.txt b/test cases/failing/52 or on new line/meson_options.txt
similarity index 100%
rename from test cases/failing/53 or on new line/meson_options.txt
rename to test cases/failing/52 or on new line/meson_options.txt
diff --git a/test cases/failing/52 or on new line/test.json b/test cases/failing/52 or on new line/test.json
new file mode 100644
index 0000000..49a7255
--- /dev/null
+++ b/test cases/failing/52 or on new line/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/52 or on new line/meson.build:4:8: ERROR: Invalid or clause."
+    }
+  ]
+}
diff --git a/test cases/failing/54 link with executable/meson.build b/test cases/failing/53 link with executable/meson.build
similarity index 100%
rename from test cases/failing/54 link with executable/meson.build
rename to test cases/failing/53 link with executable/meson.build
diff --git a/test cases/failing/54 link with executable/module.c b/test cases/failing/53 link with executable/module.c
similarity index 100%
rename from test cases/failing/54 link with executable/module.c
rename to test cases/failing/53 link with executable/module.c
diff --git a/test cases/failing/54 link with executable/prog.c b/test cases/failing/53 link with executable/prog.c
similarity index 100%
rename from test cases/failing/54 link with executable/prog.c
rename to test cases/failing/53 link with executable/prog.c
diff --git a/test cases/failing/53 link with executable/test.json b/test cases/failing/53 link with executable/test.json
new file mode 100644
index 0000000..8c25e07
--- /dev/null
+++ b/test cases/failing/53 link with executable/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/53 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
+    }
+  ]
+}
diff --git a/test cases/failing/53 or on new line/test.json b/test cases/failing/53 or on new line/test.json
deleted file mode 100644
index 3390025..0000000
--- a/test cases/failing/53 or on new line/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/53 or on new line/meson.build:4:8: ERROR: Invalid or clause."
-    }
-  ]
-}
diff --git a/test cases/failing/55 assign custom target index/meson.build b/test cases/failing/54 assign custom target index/meson.build
similarity index 100%
rename from test cases/failing/55 assign custom target index/meson.build
rename to test cases/failing/54 assign custom target index/meson.build
diff --git a/test cases/failing/54 assign custom target index/test.json b/test cases/failing/54 assign custom target index/test.json
new file mode 100644
index 0000000..15287d6
--- /dev/null
+++ b/test cases/failing/54 assign custom target index/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/54 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
+    }
+  ]
+}
diff --git a/test cases/failing/54 link with executable/test.json b/test cases/failing/54 link with executable/test.json
deleted file mode 100644
index 2b51bdd..0000000
--- a/test cases/failing/54 link with executable/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/54 link with executable/meson.build:4:4: ERROR: Link target 'prog' is not linkable."
-    }
-  ]
-}
diff --git a/test cases/failing/55 assign custom target index/test.json b/test cases/failing/55 assign custom target index/test.json
deleted file mode 100644
index 39983fb..0000000
--- a/test cases/failing/55 assign custom target index/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/55 assign custom target index/meson.build:24:0: ERROR: Assignment target must be an id."
-    }
-  ]
-}
diff --git a/test cases/failing/56 getoption prefix/meson.build b/test cases/failing/55 getoption prefix/meson.build
similarity index 100%
rename from test cases/failing/56 getoption prefix/meson.build
rename to test cases/failing/55 getoption prefix/meson.build
diff --git a/test cases/failing/56 getoption prefix/subprojects/abc/meson.build b/test cases/failing/55 getoption prefix/subprojects/abc/meson.build
similarity index 100%
rename from test cases/failing/56 getoption prefix/subprojects/abc/meson.build
rename to test cases/failing/55 getoption prefix/subprojects/abc/meson.build
diff --git a/test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt b/test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt
similarity index 100%
rename from test cases/failing/56 getoption prefix/subprojects/abc/meson_options.txt
rename to test cases/failing/55 getoption prefix/subprojects/abc/meson_options.txt
diff --git a/test cases/failing/56 getoption prefix/test.json b/test cases/failing/55 getoption prefix/test.json
similarity index 72%
rename from test cases/failing/56 getoption prefix/test.json
rename to test cases/failing/55 getoption prefix/test.json
index c52dffc..9f3a936 100644
--- a/test cases/failing/56 getoption prefix/test.json
+++ b/test cases/failing/55 getoption prefix/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/56 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
+      "line": "test cases/failing/55 getoption prefix/meson.build:5:0: ERROR: Having a colon in option name is forbidden, projects are not allowed to directly access options of other subprojects."
     }
   ]
 }
diff --git a/test cases/failing/57 bad option argument/meson.build b/test cases/failing/56 bad option argument/meson.build
similarity index 100%
rename from test cases/failing/57 bad option argument/meson.build
rename to test cases/failing/56 bad option argument/meson.build
diff --git a/test cases/failing/57 bad option argument/meson_options.txt b/test cases/failing/56 bad option argument/meson_options.txt
similarity index 100%
rename from test cases/failing/57 bad option argument/meson_options.txt
rename to test cases/failing/56 bad option argument/meson_options.txt
diff --git a/test cases/failing/57 bad option argument/test.json b/test cases/failing/56 bad option argument/test.json
similarity index 63%
rename from test cases/failing/57 bad option argument/test.json
rename to test cases/failing/56 bad option argument/test.json
index 622acdf..c7957cd 100644
--- a/test cases/failing/57 bad option argument/test.json
+++ b/test cases/failing/56 bad option argument/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/57 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
+      "line": "test cases/failing/56 bad option argument/meson_options.txt:1:0: ERROR: string option got unknown keyword arguments \"value_\""
     }
   ]
 }
diff --git a/test cases/failing/58 subproj filegrab/meson.build b/test cases/failing/57 subproj filegrab/meson.build
similarity index 100%
rename from test cases/failing/58 subproj filegrab/meson.build
rename to test cases/failing/57 subproj filegrab/meson.build
diff --git a/test cases/failing/58 subproj filegrab/prog.c b/test cases/failing/57 subproj filegrab/prog.c
similarity index 100%
rename from test cases/failing/58 subproj filegrab/prog.c
rename to test cases/failing/57 subproj filegrab/prog.c
diff --git a/test cases/failing/58 subproj filegrab/subprojects/a/meson.build b/test cases/failing/57 subproj filegrab/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/58 subproj filegrab/subprojects/a/meson.build
rename to test cases/failing/57 subproj filegrab/subprojects/a/meson.build
diff --git a/test cases/failing/58 subproj filegrab/test.json b/test cases/failing/57 subproj filegrab/test.json
similarity index 68%
rename from test cases/failing/58 subproj filegrab/test.json
rename to test cases/failing/57 subproj filegrab/test.json
index 950e109..8b0b27f 100644
--- a/test cases/failing/58 subproj filegrab/test.json
+++ b/test cases/failing/57 subproj filegrab/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/58 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
+      "line": "test cases/failing/57 subproj filegrab/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file prog.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/59 grab subproj/meson.build b/test cases/failing/58 grab subproj/meson.build
similarity index 100%
rename from test cases/failing/59 grab subproj/meson.build
rename to test cases/failing/58 grab subproj/meson.build
diff --git a/test cases/failing/59 grab subproj/subprojects/foo/meson.build b/test cases/failing/58 grab subproj/subprojects/foo/meson.build
similarity index 100%
rename from test cases/failing/59 grab subproj/subprojects/foo/meson.build
rename to test cases/failing/58 grab subproj/subprojects/foo/meson.build
diff --git a/test cases/failing/59 grab subproj/subprojects/foo/sub.c b/test cases/failing/58 grab subproj/subprojects/foo/sub.c
similarity index 100%
rename from test cases/failing/59 grab subproj/subprojects/foo/sub.c
rename to test cases/failing/58 grab subproj/subprojects/foo/sub.c
diff --git a/test cases/failing/59 grab subproj/test.json b/test cases/failing/58 grab subproj/test.json
similarity index 64%
rename from test cases/failing/59 grab subproj/test.json
rename to test cases/failing/58 grab subproj/test.json
index 7c90202..bdb0fdf 100644
--- a/test cases/failing/59 grab subproj/test.json
+++ b/test cases/failing/58 grab subproj/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/59 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
+      "line": "test cases/failing/58 grab subproj/meson.build:7:0: ERROR: Sandbox violation: Tried to grab file sub.c from a nested subproject."
     }
   ]
 }
diff --git a/test cases/failing/60 grab sibling/meson.build b/test cases/failing/59 grab sibling/meson.build
similarity index 100%
rename from test cases/failing/60 grab sibling/meson.build
rename to test cases/failing/59 grab sibling/meson.build
diff --git a/test cases/failing/60 grab sibling/subprojects/a/meson.build b/test cases/failing/59 grab sibling/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/60 grab sibling/subprojects/a/meson.build
rename to test cases/failing/59 grab sibling/subprojects/a/meson.build
diff --git a/test cases/failing/60 grab sibling/subprojects/b/meson.build b/test cases/failing/59 grab sibling/subprojects/b/meson.build
similarity index 100%
rename from test cases/failing/60 grab sibling/subprojects/b/meson.build
rename to test cases/failing/59 grab sibling/subprojects/b/meson.build
diff --git a/test cases/failing/60 grab sibling/subprojects/b/sneaky.c b/test cases/failing/59 grab sibling/subprojects/b/sneaky.c
similarity index 100%
rename from test cases/failing/60 grab sibling/subprojects/b/sneaky.c
rename to test cases/failing/59 grab sibling/subprojects/b/sneaky.c
diff --git a/test cases/failing/60 grab sibling/test.json b/test cases/failing/59 grab sibling/test.json
similarity index 68%
rename from test cases/failing/60 grab sibling/test.json
rename to test cases/failing/59 grab sibling/test.json
index 8f42bad..ec17e7e 100644
--- a/test cases/failing/60 grab sibling/test.json
+++ b/test cases/failing/59 grab sibling/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/60 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
+      "line": "test cases/failing/59 grab sibling/subprojects/a/meson.build:3:0: ERROR: Sandbox violation: Tried to grab file sneaky.c outside current (sub)project."
     }
   ]
 }
diff --git a/test cases/failing/61 string as link target/meson.build b/test cases/failing/60 string as link target/meson.build
similarity index 100%
rename from test cases/failing/61 string as link target/meson.build
rename to test cases/failing/60 string as link target/meson.build
diff --git a/test cases/failing/61 string as link target/prog.c b/test cases/failing/60 string as link target/prog.c
similarity index 100%
rename from test cases/failing/61 string as link target/prog.c
rename to test cases/failing/60 string as link target/prog.c
diff --git a/test cases/failing/60 string as link target/test.json b/test cases/failing/60 string as link target/test.json
new file mode 100644
index 0000000..a97b124
--- /dev/null
+++ b/test cases/failing/60 string as link target/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/60 string as link target/meson.build:2:0: ERROR: '' is not a target."
+    }
+  ]
+}
diff --git a/test cases/failing/62 dependency not-found and required/meson.build b/test cases/failing/61 dependency not-found and required/meson.build
similarity index 100%
rename from test cases/failing/62 dependency not-found and required/meson.build
rename to test cases/failing/61 dependency not-found and required/meson.build
diff --git a/test cases/failing/62 dependency not-found and required/test.json b/test cases/failing/61 dependency not-found and required/test.json
similarity index 63%
rename from test cases/failing/62 dependency not-found and required/test.json
rename to test cases/failing/61 dependency not-found and required/test.json
index 69a67ff..f7a6c9f 100644
--- a/test cases/failing/62 dependency not-found and required/test.json
+++ b/test cases/failing/61 dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/62 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
+      "line": "test cases/failing/61 dependency not-found and required/meson.build:2:6: ERROR: Dependency is required but has no candidates."
     }
   ]
 }
diff --git a/test cases/failing/61 string as link target/test.json b/test cases/failing/61 string as link target/test.json
deleted file mode 100644
index b7f6bd7..0000000
--- a/test cases/failing/61 string as link target/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/61 string as link target/meson.build:2:0: ERROR: '' is not a target."
-    }
-  ]
-}
diff --git a/test cases/failing/63 subproj different versions/main.c b/test cases/failing/62 subproj different versions/main.c
similarity index 100%
rename from test cases/failing/63 subproj different versions/main.c
rename to test cases/failing/62 subproj different versions/main.c
diff --git a/test cases/failing/63 subproj different versions/meson.build b/test cases/failing/62 subproj different versions/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/meson.build
rename to test cases/failing/62 subproj different versions/meson.build
diff --git a/test cases/failing/63 subproj different versions/subprojects/a/a.c b/test cases/failing/62 subproj different versions/subprojects/a/a.c
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/a/a.c
rename to test cases/failing/62 subproj different versions/subprojects/a/a.c
diff --git a/test cases/failing/63 subproj different versions/subprojects/a/a.h b/test cases/failing/62 subproj different versions/subprojects/a/a.h
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/a/a.h
rename to test cases/failing/62 subproj different versions/subprojects/a/a.h
diff --git a/test cases/failing/63 subproj different versions/subprojects/a/meson.build b/test cases/failing/62 subproj different versions/subprojects/a/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/a/meson.build
rename to test cases/failing/62 subproj different versions/subprojects/a/meson.build
diff --git a/test cases/failing/63 subproj different versions/subprojects/b/b.c b/test cases/failing/62 subproj different versions/subprojects/b/b.c
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/b/b.c
rename to test cases/failing/62 subproj different versions/subprojects/b/b.c
diff --git a/test cases/failing/63 subproj different versions/subprojects/b/b.h b/test cases/failing/62 subproj different versions/subprojects/b/b.h
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/b/b.h
rename to test cases/failing/62 subproj different versions/subprojects/b/b.h
diff --git a/test cases/failing/63 subproj different versions/subprojects/b/meson.build b/test cases/failing/62 subproj different versions/subprojects/b/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/b/meson.build
rename to test cases/failing/62 subproj different versions/subprojects/b/meson.build
diff --git a/test cases/failing/63 subproj different versions/subprojects/c/c.h b/test cases/failing/62 subproj different versions/subprojects/c/c.h
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/c/c.h
rename to test cases/failing/62 subproj different versions/subprojects/c/c.h
diff --git a/test cases/failing/63 subproj different versions/subprojects/c/meson.build b/test cases/failing/62 subproj different versions/subprojects/c/meson.build
similarity index 100%
rename from test cases/failing/63 subproj different versions/subprojects/c/meson.build
rename to test cases/failing/62 subproj different versions/subprojects/c/meson.build
diff --git a/test cases/failing/63 subproj different versions/test.json b/test cases/failing/62 subproj different versions/test.json
similarity index 64%
rename from test cases/failing/63 subproj different versions/test.json
rename to test cases/failing/62 subproj different versions/test.json
index f2535fa..705ff51 100644
--- a/test cases/failing/63 subproj different versions/test.json
+++ b/test cases/failing/62 subproj different versions/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/63 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
+      "line": "test cases/failing/62 subproj different versions/subprojects/b/meson.build:3:8: ERROR: Dependency 'c' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/64 wrong boost module/meson.build b/test cases/failing/63 wrong boost module/meson.build
similarity index 100%
rename from test cases/failing/64 wrong boost module/meson.build
rename to test cases/failing/63 wrong boost module/meson.build
diff --git a/test cases/failing/64 wrong boost module/test.json b/test cases/failing/63 wrong boost module/test.json
similarity index 60%
rename from test cases/failing/64 wrong boost module/test.json
rename to test cases/failing/63 wrong boost module/test.json
index 78e2069..ec3c1b0 100644
--- a/test cases/failing/64 wrong boost module/test.json
+++ b/test cases/failing/63 wrong boost module/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/64 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
+      "line": "test cases/failing/63 wrong boost module/meson.build:9:10: ERROR: Dependency \"boost\" not found, tried system"
     }
   ]
 }
diff --git a/test cases/failing/65 install_data rename bad size/file1.txt b/test cases/failing/64 install_data rename bad size/file1.txt
similarity index 100%
rename from test cases/failing/65 install_data rename bad size/file1.txt
rename to test cases/failing/64 install_data rename bad size/file1.txt
diff --git a/test cases/failing/65 install_data rename bad size/file2.txt b/test cases/failing/64 install_data rename bad size/file2.txt
similarity index 100%
rename from test cases/failing/65 install_data rename bad size/file2.txt
rename to test cases/failing/64 install_data rename bad size/file2.txt
diff --git a/test cases/failing/65 install_data rename bad size/meson.build b/test cases/failing/64 install_data rename bad size/meson.build
similarity index 100%
rename from test cases/failing/65 install_data rename bad size/meson.build
rename to test cases/failing/64 install_data rename bad size/meson.build
diff --git a/test cases/failing/65 install_data rename bad size/test.json b/test cases/failing/64 install_data rename bad size/test.json
similarity index 74%
rename from test cases/failing/65 install_data rename bad size/test.json
rename to test cases/failing/64 install_data rename bad size/test.json
index efc6290..5ed4748 100644
--- a/test cases/failing/65 install_data rename bad size/test.json
+++ b/test cases/failing/64 install_data rename bad size/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/65 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
+      "line": "test cases/failing/64 install_data rename bad size/meson.build:3:0: ERROR: \"rename\" and \"sources\" argument lists must be the same length if \"rename\" is given. Rename has 1 elements and sources has 2."
     }
   ]
 }
diff --git a/test cases/failing/66 skip only subdir/meson.build b/test cases/failing/65 skip only subdir/meson.build
similarity index 100%
rename from test cases/failing/66 skip only subdir/meson.build
rename to test cases/failing/65 skip only subdir/meson.build
diff --git a/test cases/failing/66 skip only subdir/subdir/meson.build b/test cases/failing/65 skip only subdir/subdir/meson.build
similarity index 100%
rename from test cases/failing/66 skip only subdir/subdir/meson.build
rename to test cases/failing/65 skip only subdir/subdir/meson.build
diff --git a/test cases/failing/65 skip only subdir/test.json b/test cases/failing/65 skip only subdir/test.json
new file mode 100644
index 0000000..2747566
--- /dev/null
+++ b/test cases/failing/65 skip only subdir/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/65 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
+    }
+  ]
+}
diff --git a/test cases/failing/67 dual override/meson.build b/test cases/failing/66 dual override/meson.build
similarity index 100%
rename from test cases/failing/67 dual override/meson.build
rename to test cases/failing/66 dual override/meson.build
diff --git a/test cases/failing/67 dual override/overrides.py b/test cases/failing/66 dual override/overrides.py
similarity index 100%
rename from test cases/failing/67 dual override/overrides.py
rename to test cases/failing/66 dual override/overrides.py
diff --git a/test cases/failing/67 dual override/test.json b/test cases/failing/66 dual override/test.json
similarity index 65%
rename from test cases/failing/67 dual override/test.json
rename to test cases/failing/66 dual override/test.json
index b50f3ac..b8c2651 100644
--- a/test cases/failing/67 dual override/test.json
+++ b/test cases/failing/66 dual override/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/67 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
+      "line": "test cases/failing/66 dual override/meson.build:5:6: ERROR: Tried to override executable \"override\" which has already been overridden."
     }
   ]
 }
diff --git a/test cases/failing/66 skip only subdir/test.json b/test cases/failing/66 skip only subdir/test.json
deleted file mode 100644
index de21e00..0000000
--- a/test cases/failing/66 skip only subdir/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/66 skip only subdir/meson.build:8:0: ERROR: File main.cpp does not exist."
-    }
-  ]
-}
diff --git a/test cases/failing/68 override used/meson.build b/test cases/failing/67 override used/meson.build
similarity index 100%
rename from test cases/failing/68 override used/meson.build
rename to test cases/failing/67 override used/meson.build
diff --git a/test cases/failing/68 override used/other.py b/test cases/failing/67 override used/other.py
similarity index 100%
rename from test cases/failing/68 override used/other.py
rename to test cases/failing/67 override used/other.py
diff --git a/test cases/failing/68 override used/something.py b/test cases/failing/67 override used/something.py
similarity index 100%
rename from test cases/failing/68 override used/something.py
rename to test cases/failing/67 override used/something.py
diff --git a/test cases/failing/68 override used/test.json b/test cases/failing/67 override used/test.json
similarity index 67%
rename from test cases/failing/68 override used/test.json
rename to test cases/failing/67 override used/test.json
index f11aac6..90d8b4b 100644
--- a/test cases/failing/68 override used/test.json
+++ b/test cases/failing/67 override used/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/68 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
+      "line": "test cases/failing/67 override used/meson.build:5:6: ERROR: Tried to override finding of executable \"something.py\" which has already been found."
     }
   ]
 }
diff --git a/test cases/failing/69 run_command unclean exit/meson.build b/test cases/failing/68 run_command unclean exit/meson.build
similarity index 100%
rename from test cases/failing/69 run_command unclean exit/meson.build
rename to test cases/failing/68 run_command unclean exit/meson.build
diff --git a/test cases/failing/69 run_command unclean exit/returncode.py b/test cases/failing/68 run_command unclean exit/returncode.py
similarity index 100%
rename from test cases/failing/69 run_command unclean exit/returncode.py
rename to test cases/failing/68 run_command unclean exit/returncode.py
diff --git a/test cases/failing/68 run_command unclean exit/test.json b/test cases/failing/68 run_command unclean exit/test.json
new file mode 100644
index 0000000..cef67e5
--- /dev/null
+++ b/test cases/failing/68 run_command unclean exit/test.json
@@ -0,0 +1,8 @@
+{
+  "stdout": [
+    {
+      "match": "re",
+      "line": "test cases/failing/68 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]68 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
+    }
+  ]
+}
diff --git a/test cases/failing/70 int literal leading zero/meson.build b/test cases/failing/69 int literal leading zero/meson.build
similarity index 100%
rename from test cases/failing/70 int literal leading zero/meson.build
rename to test cases/failing/69 int literal leading zero/meson.build
diff --git a/test cases/failing/70 int literal leading zero/test.json b/test cases/failing/69 int literal leading zero/test.json
similarity index 69%
rename from test cases/failing/70 int literal leading zero/test.json
rename to test cases/failing/69 int literal leading zero/test.json
index fafbf0d..200b569 100644
--- a/test cases/failing/70 int literal leading zero/test.json
+++ b/test cases/failing/69 int literal leading zero/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "this error message is not very informative",
-      "line": "test cases/failing/70 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
+      "line": "test cases/failing/69 int literal leading zero/meson.build:5:13: ERROR: Expecting eof got number."
     }
   ]
 }
diff --git a/test cases/failing/69 run_command unclean exit/test.json b/test cases/failing/69 run_command unclean exit/test.json
deleted file mode 100644
index 96c2141..0000000
--- a/test cases/failing/69 run_command unclean exit/test.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "stdout": [
-    {
-      "match": "re",
-      "line": "test cases/failing/69 run_command unclean exit/meson\\.build:4:0: ERROR: Command `.*['\"].*[\\\\/]test cases[\\\\/]failing[\\\\/]69 run_command unclean exit[\\\\/]\\.[\\\\/]returncode\\.py['\"] 1` failed with status 1\\."
-    }
-  ]
-}
diff --git a/test cases/failing/71 configuration immutable/input b/test cases/failing/70 configuration immutable/input
similarity index 100%
rename from test cases/failing/71 configuration immutable/input
rename to test cases/failing/70 configuration immutable/input
diff --git a/test cases/failing/71 configuration immutable/meson.build b/test cases/failing/70 configuration immutable/meson.build
similarity index 100%
rename from test cases/failing/71 configuration immutable/meson.build
rename to test cases/failing/70 configuration immutable/meson.build
diff --git a/test cases/failing/71 configuration immutable/test.json b/test cases/failing/70 configuration immutable/test.json
similarity index 65%
rename from test cases/failing/71 configuration immutable/test.json
rename to test cases/failing/70 configuration immutable/test.json
index af1a65d..fc735fa 100644
--- a/test cases/failing/71 configuration immutable/test.json
+++ b/test cases/failing/70 configuration immutable/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/71 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
+      "line": "test cases/failing/70 configuration immutable/meson.build:12:16: ERROR: Can not set values on configuration object that has been used."
     }
   ]
 }
diff --git a/test cases/failing/72 link with shared module on osx/meson.build b/test cases/failing/71 link with shared module on osx/meson.build
similarity index 100%
rename from test cases/failing/72 link with shared module on osx/meson.build
rename to test cases/failing/71 link with shared module on osx/meson.build
diff --git a/test cases/failing/72 link with shared module on osx/module.c b/test cases/failing/71 link with shared module on osx/module.c
similarity index 100%
rename from test cases/failing/72 link with shared module on osx/module.c
rename to test cases/failing/71 link with shared module on osx/module.c
diff --git a/test cases/failing/72 link with shared module on osx/prog.c b/test cases/failing/71 link with shared module on osx/prog.c
similarity index 100%
rename from test cases/failing/72 link with shared module on osx/prog.c
rename to test cases/failing/71 link with shared module on osx/prog.c
diff --git a/test cases/failing/72 link with shared module on osx/test.json b/test cases/failing/71 link with shared module on osx/test.json
similarity index 68%
rename from test cases/failing/72 link with shared module on osx/test.json
rename to test cases/failing/71 link with shared module on osx/test.json
index 1a2d78c..206d429 100644
--- a/test cases/failing/72 link with shared module on osx/test.json
+++ b/test cases/failing/71 link with shared module on osx/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/72 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
+      "line": "test cases/failing/71 link with shared module on osx/meson.build:8:4: ERROR: target prog links against shared module mymodule. This is not permitted on OSX"
     }
   ]
 }
diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in b/test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in
similarity index 100%
rename from test cases/failing/73 non-ascii in ascii encoded configure file/config9.h.in
rename to test cases/failing/72 non-ascii in ascii encoded configure file/config9.h.in
diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/meson.build b/test cases/failing/72 non-ascii in ascii encoded configure file/meson.build
similarity index 100%
rename from test cases/failing/73 non-ascii in ascii encoded configure file/meson.build
rename to test cases/failing/72 non-ascii in ascii encoded configure file/meson.build
diff --git a/test cases/failing/73 non-ascii in ascii encoded configure file/test.json b/test cases/failing/72 non-ascii in ascii encoded configure file/test.json
similarity index 79%
rename from test cases/failing/73 non-ascii in ascii encoded configure file/test.json
rename to test cases/failing/72 non-ascii in ascii encoded configure file/test.json
index 63f5bef..1dc0b91 100644
--- a/test cases/failing/73 non-ascii in ascii encoded configure file/test.json
+++ b/test cases/failing/72 non-ascii in ascii encoded configure file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "match": "re",
-      "line": "test cases/failing/73 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
+      "line": "test cases/failing/72 non-ascii in ascii encoded configure file/meson\\.build:5:0: ERROR: Could not write output file .*[\\\\/]config9\\.h: 'ascii' codec can't encode character '\\\\u0434' in position 17: ordinal not in range\\(128\\)"
     }
   ]
 }
diff --git a/test cases/failing/74 subproj dependency not-found and required/meson.build b/test cases/failing/73 subproj dependency not-found and required/meson.build
similarity index 100%
rename from test cases/failing/74 subproj dependency not-found and required/meson.build
rename to test cases/failing/73 subproj dependency not-found and required/meson.build
diff --git a/test cases/failing/74 subproj dependency not-found and required/test.json b/test cases/failing/73 subproj dependency not-found and required/test.json
similarity index 68%
rename from test cases/failing/74 subproj dependency not-found and required/test.json
rename to test cases/failing/73 subproj dependency not-found and required/test.json
index 997bc56..11ab031 100644
--- a/test cases/failing/74 subproj dependency not-found and required/test.json
+++ b/test cases/failing/73 subproj dependency not-found and required/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/74 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
+      "line": "test cases/failing/73 subproj dependency not-found and required/meson.build:2:10: ERROR: Neither a subproject directory nor a missing.wrap file was found."
     }
   ]
 }
diff --git a/test cases/failing/75 unfound run/meson.build b/test cases/failing/74 unfound run/meson.build
similarity index 100%
rename from test cases/failing/75 unfound run/meson.build
rename to test cases/failing/74 unfound run/meson.build
diff --git a/test cases/failing/75 unfound run/test.json b/test cases/failing/74 unfound run/test.json
similarity index 61%
rename from test cases/failing/75 unfound run/test.json
rename to test cases/failing/74 unfound run/test.json
index 855c2a4..8d31785 100644
--- a/test cases/failing/75 unfound run/test.json
+++ b/test cases/failing/74 unfound run/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/75 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
+      "line": "test cases/failing/74 unfound run/meson.build:4:0: ERROR: Tried to use non-existing executable 'nonexisting_prog'"
     }
   ]
 }
diff --git a/test cases/failing/76 framework dependency with version/meson.build b/test cases/failing/75 framework dependency with version/meson.build
similarity index 100%
rename from test cases/failing/76 framework dependency with version/meson.build
rename to test cases/failing/75 framework dependency with version/meson.build
diff --git a/test cases/failing/76 framework dependency with version/test.json b/test cases/failing/75 framework dependency with version/test.json
similarity index 72%
rename from test cases/failing/76 framework dependency with version/test.json
rename to test cases/failing/75 framework dependency with version/test.json
index 07b4a6e..8a01356 100644
--- a/test cases/failing/76 framework dependency with version/test.json
+++ b/test cases/failing/75 framework dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/76 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/75 framework dependency with version/meson.build:8:6: ERROR: Dependency lookup for appleframeworks with method 'framework' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/77 override exe config/foo.c b/test cases/failing/76 override exe config/foo.c
similarity index 100%
rename from test cases/failing/77 override exe config/foo.c
rename to test cases/failing/76 override exe config/foo.c
diff --git a/test cases/failing/77 override exe config/meson.build b/test cases/failing/76 override exe config/meson.build
similarity index 100%
rename from test cases/failing/77 override exe config/meson.build
rename to test cases/failing/76 override exe config/meson.build
diff --git a/test cases/failing/77 override exe config/test.json b/test cases/failing/76 override exe config/test.json
similarity index 72%
rename from test cases/failing/77 override exe config/test.json
rename to test cases/failing/76 override exe config/test.json
index a0dd7ae..23b9055 100644
--- a/test cases/failing/77 override exe config/test.json
+++ b/test cases/failing/76 override exe config/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/77 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
+      "line": "test cases/failing/76 override exe config/meson.build:6:0: ERROR: Program 'bar' was overridden with the compiled executable 'foo' and therefore cannot be used during configuration"
     }
   ]
 }
diff --git a/test cases/failing/78 gl dependency with version/meson.build b/test cases/failing/77 gl dependency with version/meson.build
similarity index 100%
rename from test cases/failing/78 gl dependency with version/meson.build
rename to test cases/failing/77 gl dependency with version/meson.build
diff --git a/test cases/failing/78 gl dependency with version/test.json b/test cases/failing/77 gl dependency with version/test.json
similarity index 69%
rename from test cases/failing/78 gl dependency with version/test.json
rename to test cases/failing/77 gl dependency with version/test.json
index fbd9ff9..83665cb 100644
--- a/test cases/failing/78 gl dependency with version/test.json
+++ b/test cases/failing/77 gl dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/78 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/77 gl dependency with version/meson.build:9:6: ERROR: Dependency lookup for gl with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/79 threads dependency with version/meson.build b/test cases/failing/78 threads dependency with version/meson.build
similarity index 100%
rename from test cases/failing/79 threads dependency with version/meson.build
rename to test cases/failing/78 threads dependency with version/meson.build
diff --git a/test cases/failing/79 threads dependency with version/test.json b/test cases/failing/78 threads dependency with version/test.json
similarity index 71%
rename from test cases/failing/79 threads dependency with version/test.json
rename to test cases/failing/78 threads dependency with version/test.json
index 890695b..ec02c2b 100644
--- a/test cases/failing/79 threads dependency with version/test.json
+++ b/test cases/failing/78 threads dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/79 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
+      "line": "test cases/failing/78 threads dependency with version/meson.build:3:6: ERROR: Dependency lookup for threads with method 'system' failed: Unknown version, but need ['>0']."
     }
   ]
 }
diff --git a/test cases/failing/80 gtest dependency with version/meson.build b/test cases/failing/79 gtest dependency with version/meson.build
similarity index 100%
rename from test cases/failing/80 gtest dependency with version/meson.build
rename to test cases/failing/79 gtest dependency with version/meson.build
diff --git a/test cases/failing/80 gtest dependency with version/test.json b/test cases/failing/79 gtest dependency with version/test.json
similarity index 62%
rename from test cases/failing/80 gtest dependency with version/test.json
rename to test cases/failing/79 gtest dependency with version/test.json
index 3f9934d..a32a3c2 100644
--- a/test cases/failing/80 gtest dependency with version/test.json
+++ b/test cases/failing/79 gtest dependency with version/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/80 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
+      "line": "test cases/failing/79 gtest dependency with version/meson.build:8:6: ERROR: Dependency 'gtest' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/81 dub library/meson.build b/test cases/failing/80 dub library/meson.build
similarity index 100%
rename from test cases/failing/81 dub library/meson.build
rename to test cases/failing/80 dub library/meson.build
diff --git a/test cases/failing/80 dub library/test.json b/test cases/failing/80 dub library/test.json
new file mode 100644
index 0000000..d3c7d42
--- /dev/null
+++ b/test cases/failing/80 dub library/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/80 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
+    }
+  ]
+}
diff --git a/test cases/failing/82 dub executable/meson.build b/test cases/failing/81 dub executable/meson.build
similarity index 100%
rename from test cases/failing/82 dub executable/meson.build
rename to test cases/failing/81 dub executable/meson.build
diff --git a/test cases/failing/81 dub executable/test.json b/test cases/failing/81 dub executable/test.json
new file mode 100644
index 0000000..8aefa17
--- /dev/null
+++ b/test cases/failing/81 dub executable/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/81 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
+    }
+  ]
+}
diff --git a/test cases/failing/81 dub library/test.json b/test cases/failing/81 dub library/test.json
deleted file mode 100644
index 2db91ee..0000000
--- a/test cases/failing/81 dub library/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/81 dub library/meson.build:11:0: ERROR: Dependency \"dubtestproject\" not found"
-    }
-  ]
-}
diff --git a/test cases/failing/83 dub compiler/meson.build b/test cases/failing/82 dub compiler/meson.build
similarity index 100%
rename from test cases/failing/83 dub compiler/meson.build
rename to test cases/failing/82 dub compiler/meson.build
diff --git a/test cases/failing/83 dub compiler/test.json b/test cases/failing/82 dub compiler/test.json
similarity index 81%
rename from test cases/failing/83 dub compiler/test.json
rename to test cases/failing/82 dub compiler/test.json
index 07241d2..89d1882 100644
--- a/test cases/failing/83 dub compiler/test.json
+++ b/test cases/failing/82 dub compiler/test.json
@@ -13,7 +13,7 @@
   },
   "stdout": [
     {
-      "line": "test cases/failing/83 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
+      "line": "test cases/failing/82 dub compiler/meson.build:17:0: ERROR: Dependency \"dubtestproject:test2\" not found"
     }
   ]
 }
diff --git a/test cases/failing/82 dub executable/test.json b/test cases/failing/82 dub executable/test.json
deleted file mode 100644
index 8ae46b8..0000000
--- a/test cases/failing/82 dub executable/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/82 dub executable/meson.build:11:0: ERROR: Dependency \"dubtestproject:test1\" not found"
-    }
-  ]
-}
diff --git a/test cases/failing/84 subproj not-found dep/meson.build b/test cases/failing/83 subproj not-found dep/meson.build
similarity index 100%
rename from test cases/failing/84 subproj not-found dep/meson.build
rename to test cases/failing/83 subproj not-found dep/meson.build
diff --git a/test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build b/test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build
similarity index 100%
rename from test cases/failing/84 subproj not-found dep/subprojects/somesubproj/meson.build
rename to test cases/failing/83 subproj not-found dep/subprojects/somesubproj/meson.build
diff --git a/test cases/failing/84 subproj not-found dep/test.json b/test cases/failing/83 subproj not-found dep/test.json
similarity index 62%
rename from test cases/failing/84 subproj not-found dep/test.json
rename to test cases/failing/83 subproj not-found dep/test.json
index bea1ed0..5da4fb9 100644
--- a/test cases/failing/84 subproj not-found dep/test.json
+++ b/test cases/failing/83 subproj not-found dep/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/84 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
+      "line": "test cases/failing/83 subproj not-found dep/meson.build:2:10: ERROR: Dependency '(anonymous)' is required but not found."
     }
   ]
 }
diff --git a/test cases/failing/85 invalid configure file/input b/test cases/failing/84 invalid configure file/input
similarity index 100%
rename from test cases/failing/85 invalid configure file/input
rename to test cases/failing/84 invalid configure file/input
diff --git a/test cases/failing/85 invalid configure file/meson.build b/test cases/failing/84 invalid configure file/meson.build
similarity index 100%
rename from test cases/failing/85 invalid configure file/meson.build
rename to test cases/failing/84 invalid configure file/meson.build
diff --git a/test cases/failing/85 invalid configure file/test.json b/test cases/failing/84 invalid configure file/test.json
similarity index 67%
rename from test cases/failing/85 invalid configure file/test.json
rename to test cases/failing/84 invalid configure file/test.json
index 1cee208..2b7a745 100644
--- a/test cases/failing/85 invalid configure file/test.json
+++ b/test cases/failing/84 invalid configure file/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/85 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
+      "line": "test cases/failing/84 invalid configure file/meson.build:3:0: ERROR: \"install_dir\" must be specified when \"install\" in a configure_file is true"
     }
   ]
 }
diff --git a/test cases/failing/86 kwarg dupe/meson.build b/test cases/failing/85 kwarg dupe/meson.build
similarity index 100%
rename from test cases/failing/86 kwarg dupe/meson.build
rename to test cases/failing/85 kwarg dupe/meson.build
diff --git a/test cases/failing/86 kwarg dupe/prog.c b/test cases/failing/85 kwarg dupe/prog.c
similarity index 100%
rename from test cases/failing/86 kwarg dupe/prog.c
rename to test cases/failing/85 kwarg dupe/prog.c
diff --git a/test cases/failing/86 kwarg dupe/test.json b/test cases/failing/85 kwarg dupe/test.json
similarity index 65%
rename from test cases/failing/86 kwarg dupe/test.json
rename to test cases/failing/85 kwarg dupe/test.json
index 229debb..99719ad 100644
--- a/test cases/failing/86 kwarg dupe/test.json
+++ b/test cases/failing/85 kwarg dupe/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/86 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
+      "line": "test cases/failing/85 kwarg dupe/meson.build:6:2: ERROR: Entry \"install\" defined both as a keyword argument and in a \"kwarg\" entry."
     }
   ]
 }
diff --git a/test cases/failing/87 missing pch file/meson.build b/test cases/failing/86 missing pch file/meson.build
similarity index 100%
rename from test cases/failing/87 missing pch file/meson.build
rename to test cases/failing/86 missing pch file/meson.build
diff --git a/test cases/failing/87 missing pch file/prog.c b/test cases/failing/86 missing pch file/prog.c
similarity index 100%
rename from test cases/failing/87 missing pch file/prog.c
rename to test cases/failing/86 missing pch file/prog.c
diff --git a/test cases/failing/87 missing pch file/test.json b/test cases/failing/86 missing pch file/test.json
similarity index 74%
rename from test cases/failing/87 missing pch file/test.json
rename to test cases/failing/86 missing pch file/test.json
index a54acb7..d6a50c2 100644
--- a/test cases/failing/87 missing pch file/test.json
+++ b/test cases/failing/86 missing pch file/test.json
@@ -2,7 +2,7 @@
   "stdout": [
     {
       "comment": "literal 'pch/prog.h' from meson.build appears in output, irrespective of os.path.sep",
-      "line": "test cases/failing/87 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist."
+      "line": "test cases/failing/86 missing pch file/meson.build:2:6: ERROR: File pch/prog.h does not exist."
     }
   ]
 }
diff --git a/test cases/failing/88 pch source different folder/include/pch.h b/test cases/failing/87 pch source different folder/include/pch.h
similarity index 100%
rename from test cases/failing/88 pch source different folder/include/pch.h
rename to test cases/failing/87 pch source different folder/include/pch.h
diff --git a/test cases/failing/88 pch source different folder/meson.build b/test cases/failing/87 pch source different folder/meson.build
similarity index 100%
rename from test cases/failing/88 pch source different folder/meson.build
rename to test cases/failing/87 pch source different folder/meson.build
diff --git a/test cases/failing/88 pch source different folder/prog.c b/test cases/failing/87 pch source different folder/prog.c
similarity index 100%
rename from test cases/failing/88 pch source different folder/prog.c
rename to test cases/failing/87 pch source different folder/prog.c
diff --git a/test cases/failing/88 pch source different folder/src/pch.c b/test cases/failing/87 pch source different folder/src/pch.c
similarity index 100%
rename from test cases/failing/88 pch source different folder/src/pch.c
rename to test cases/failing/87 pch source different folder/src/pch.c
diff --git a/test cases/failing/88 pch source different folder/test.json b/test cases/failing/87 pch source different folder/test.json
similarity index 62%
rename from test cases/failing/88 pch source different folder/test.json
rename to test cases/failing/87 pch source different folder/test.json
index 60fa4e0..0a9d39d 100644
--- a/test cases/failing/88 pch source different folder/test.json
+++ b/test cases/failing/87 pch source different folder/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/88 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder."
+      "line": "test cases/failing/87 pch source different folder/meson.build:4:6: ERROR: PCH files must be stored in the same folder."
     }
   ]
 }
diff --git a/test cases/failing/89 unknown config tool/meson.build b/test cases/failing/88 unknown config tool/meson.build
similarity index 100%
rename from test cases/failing/89 unknown config tool/meson.build
rename to test cases/failing/88 unknown config tool/meson.build
diff --git a/test cases/failing/89 unknown config tool/test.json b/test cases/failing/88 unknown config tool/test.json
similarity index 60%
rename from test cases/failing/89 unknown config tool/test.json
rename to test cases/failing/88 unknown config tool/test.json
index f5c0d96..5a53b26 100644
--- a/test cases/failing/89 unknown config tool/test.json
+++ b/test cases/failing/88 unknown config tool/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/89 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
+      "line": "test cases/failing/88 unknown config tool/meson.build:2:0: ERROR: Dependency \"no-such-config-tool\" not found"
     }
   ]
 }
diff --git a/test cases/failing/90 custom target install data/Info.plist.cpp b/test cases/failing/89 custom target install data/Info.plist.cpp
similarity index 100%
rename from test cases/failing/90 custom target install data/Info.plist.cpp
rename to test cases/failing/89 custom target install data/Info.plist.cpp
diff --git a/test cases/failing/90 custom target install data/meson.build b/test cases/failing/89 custom target install data/meson.build
similarity index 100%
rename from test cases/failing/90 custom target install data/meson.build
rename to test cases/failing/89 custom target install data/meson.build
diff --git a/test cases/failing/90 custom target install data/preproc.py b/test cases/failing/89 custom target install data/preproc.py
similarity index 100%
rename from test cases/failing/90 custom target install data/preproc.py
rename to test cases/failing/89 custom target install data/preproc.py
diff --git a/test cases/failing/90 custom target install data/test.json b/test cases/failing/89 custom target install data/test.json
similarity index 71%
rename from test cases/failing/90 custom target install data/test.json
rename to test cases/failing/89 custom target install data/test.json
index d495163..3364a6a 100644
--- a/test cases/failing/90 custom target install data/test.json
+++ b/test cases/failing/89 custom target install data/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/90 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
+      "line": "test cases/failing/89 custom target install data/meson.build:11:0: ERROR: install_data argument 1 was of type \"CustomTarget\" but should have been one of: \"str\", \"File\""
     }
   ]
 }
diff --git a/test cases/failing/91 add dict non string key/meson.build b/test cases/failing/90 add dict non string key/meson.build
similarity index 100%
rename from test cases/failing/91 add dict non string key/meson.build
rename to test cases/failing/90 add dict non string key/meson.build
diff --git a/test cases/failing/90 add dict non string key/test.json b/test cases/failing/90 add dict non string key/test.json
new file mode 100644
index 0000000..822e09f
--- /dev/null
+++ b/test cases/failing/90 add dict non string key/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/90 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
+    }
+  ]
+}
diff --git a/test cases/failing/92 add dict duplicate keys/meson.build b/test cases/failing/91 add dict duplicate keys/meson.build
similarity index 100%
rename from test cases/failing/92 add dict duplicate keys/meson.build
rename to test cases/failing/91 add dict duplicate keys/meson.build
diff --git a/test cases/failing/91 add dict duplicate keys/test.json b/test cases/failing/91 add dict duplicate keys/test.json
new file mode 100644
index 0000000..b6941e7
--- /dev/null
+++ b/test cases/failing/91 add dict duplicate keys/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/91 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
+    }
+  ]
+}
diff --git a/test cases/failing/91 add dict non string key/test.json b/test cases/failing/91 add dict non string key/test.json
deleted file mode 100644
index db506b2..0000000
--- a/test cases/failing/91 add dict non string key/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/91 add dict non string key/meson.build:9:9: ERROR: Key must be a string"
-    }
-  ]
-}
diff --git a/test cases/failing/92 add dict duplicate keys/test.json b/test cases/failing/92 add dict duplicate keys/test.json
deleted file mode 100644
index b428a53..0000000
--- a/test cases/failing/92 add dict duplicate keys/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/92 add dict duplicate keys/meson.build:9:27: ERROR: Duplicate dictionary key: myKey"
-    }
-  ]
-}
diff --git a/test cases/failing/93 no host get_external_property/meson.build b/test cases/failing/92 no host get_external_property/meson.build
similarity index 100%
rename from test cases/failing/93 no host get_external_property/meson.build
rename to test cases/failing/92 no host get_external_property/meson.build
diff --git a/test cases/failing/93 no host get_external_property/test.json b/test cases/failing/92 no host get_external_property/test.json
similarity index 63%
rename from test cases/failing/93 no host get_external_property/test.json
rename to test cases/failing/92 no host get_external_property/test.json
index b26f3c9..0f7a803 100644
--- a/test cases/failing/93 no host get_external_property/test.json
+++ b/test cases/failing/92 no host get_external_property/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/93 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
+      "line": "test cases/failing/92 no host get_external_property/meson.build:3:14: ERROR: Unknown property for host machine: nonexisting"
     }
   ]
 }
diff --git a/test cases/failing/94 no native compiler/main.c b/test cases/failing/93 no native compiler/main.c
similarity index 100%
rename from test cases/failing/94 no native compiler/main.c
rename to test cases/failing/93 no native compiler/main.c
diff --git a/test cases/failing/94 no native compiler/meson.build b/test cases/failing/93 no native compiler/meson.build
similarity index 100%
rename from test cases/failing/94 no native compiler/meson.build
rename to test cases/failing/93 no native compiler/meson.build
diff --git a/test cases/failing/93 no native compiler/test.json b/test cases/failing/93 no native compiler/test.json
new file mode 100644
index 0000000..adf99f1
--- /dev/null
+++ b/test cases/failing/93 no native compiler/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/93 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
+    }
+  ]
+}
diff --git a/test cases/failing/94 no native compiler/test.json b/test cases/failing/94 no native compiler/test.json
deleted file mode 100644
index 7181c6b..0000000
--- a/test cases/failing/94 no native compiler/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/94 no native compiler/meson.build:12:0: ERROR: No host machine compiler for \"main.c\""
-    }
-  ]
-}
diff --git a/test cases/failing/95 subdir parse error/meson.build b/test cases/failing/94 subdir parse error/meson.build
similarity index 100%
rename from test cases/failing/95 subdir parse error/meson.build
rename to test cases/failing/94 subdir parse error/meson.build
diff --git a/test cases/failing/95 subdir parse error/subdir/meson.build b/test cases/failing/94 subdir parse error/subdir/meson.build
similarity index 100%
rename from test cases/failing/95 subdir parse error/subdir/meson.build
rename to test cases/failing/94 subdir parse error/subdir/meson.build
diff --git a/test cases/failing/94 subdir parse error/test.json b/test cases/failing/94 subdir parse error/test.json
new file mode 100644
index 0000000..0bf82c1
--- /dev/null
+++ b/test cases/failing/94 subdir parse error/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/94 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
+    }
+  ]
+}
diff --git a/test cases/failing/96 invalid option file/meson.build b/test cases/failing/95 invalid option file/meson.build
similarity index 100%
rename from test cases/failing/96 invalid option file/meson.build
rename to test cases/failing/95 invalid option file/meson.build
diff --git a/test cases/failing/96 invalid option file/meson_options.txt b/test cases/failing/95 invalid option file/meson_options.txt
similarity index 100%
rename from test cases/failing/96 invalid option file/meson_options.txt
rename to test cases/failing/95 invalid option file/meson_options.txt
diff --git a/test cases/failing/95 invalid option file/test.json b/test cases/failing/95 invalid option file/test.json
new file mode 100644
index 0000000..073ac67
--- /dev/null
+++ b/test cases/failing/95 invalid option file/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/95 invalid option file/meson_options.txt:1:0: ERROR: lexer"
+    }
+  ]
+}
diff --git a/test cases/failing/95 subdir parse error/test.json b/test cases/failing/95 subdir parse error/test.json
deleted file mode 100644
index c94ed58..0000000
--- a/test cases/failing/95 subdir parse error/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/95 subdir parse error/subdir/meson.build:1:0: ERROR: Plusassignment target must be an id."
-    }
-  ]
-}
diff --git a/test cases/failing/96 invalid option file/test.json b/test cases/failing/96 invalid option file/test.json
deleted file mode 100644
index 5f1a89f..0000000
--- a/test cases/failing/96 invalid option file/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/96 invalid option file/meson_options.txt:1:0: ERROR: lexer"
-    }
-  ]
-}
diff --git a/test cases/failing/97 no lang/main.c b/test cases/failing/96 no lang/main.c
similarity index 100%
rename from test cases/failing/97 no lang/main.c
rename to test cases/failing/96 no lang/main.c
diff --git a/test cases/failing/97 no lang/meson.build b/test cases/failing/96 no lang/meson.build
similarity index 100%
rename from test cases/failing/97 no lang/meson.build
rename to test cases/failing/96 no lang/meson.build
diff --git a/test cases/failing/96 no lang/test.json b/test cases/failing/96 no lang/test.json
new file mode 100644
index 0000000..ab4ca5c
--- /dev/null
+++ b/test cases/failing/96 no lang/test.json
@@ -0,0 +1,7 @@
+{
+  "stdout": [
+    {
+      "line": "test cases/failing/96 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
+    }
+  ]
+}
diff --git a/test cases/failing/98 no glib-compile-resources/meson.build b/test cases/failing/97 no glib-compile-resources/meson.build
similarity index 100%
rename from test cases/failing/98 no glib-compile-resources/meson.build
rename to test cases/failing/97 no glib-compile-resources/meson.build
diff --git a/test cases/failing/98 no glib-compile-resources/test.json b/test cases/failing/97 no glib-compile-resources/test.json
similarity index 65%
rename from test cases/failing/98 no glib-compile-resources/test.json
rename to test cases/failing/97 no glib-compile-resources/test.json
index d5edd76..f3d92dd 100644
--- a/test cases/failing/98 no glib-compile-resources/test.json
+++ b/test cases/failing/97 no glib-compile-resources/test.json
@@ -1,7 +1,7 @@
 {
   "stdout": [
     {
-      "line": "test cases/failing/98 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
+      "line": "test cases/failing/97 no glib-compile-resources/meson.build:8:12: ERROR: Program 'glib-compile-resources' not found or not executable"
     }
   ]
 }
diff --git a/test cases/failing/98 no glib-compile-resources/trivial.gresource.xml b/test cases/failing/97 no glib-compile-resources/trivial.gresource.xml
similarity index 100%
rename from test cases/failing/98 no glib-compile-resources/trivial.gresource.xml
rename to test cases/failing/97 no glib-compile-resources/trivial.gresource.xml
diff --git a/test cases/failing/97 no lang/test.json b/test cases/failing/97 no lang/test.json
deleted file mode 100644
index a2af0a1..0000000
--- a/test cases/failing/97 no lang/test.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "stdout": [
-    {
-      "line": "test cases/failing/97 no lang/meson.build:2:0: ERROR: No host machine compiler for 'main.c'"
-    }
-  ]
-}
diff --git a/test cases/failing/99 number in combo/meson.build b/test cases/failing/98 number in combo/meson.build
similarity index 100%
rename from test cases/failing/99 number in combo/meson.build
rename to test cases/failing/98 number in combo/meson.build
diff --git a/test cases/failing/99 number in combo/nativefile.ini b/test cases/failing/98 number in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/99 number in combo/nativefile.ini
rename to test cases/failing/98 number in combo/nativefile.ini
diff --git a/test cases/failing/99 number in combo/test.json b/test cases/failing/98 number in combo/test.json
similarity index 77%
rename from test cases/failing/99 number in combo/test.json
rename to test cases/failing/98 number in combo/test.json
index f59812e..ecac667 100644
--- a/test cases/failing/99 number in combo/test.json
+++ b/test cases/failing/98 number in combo/test.json
@@ -1,5 +1,5 @@
 {
   "stdout": [
-    { "line": "test cases/failing/99 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
+    { "line": "test cases/failing/98 number in combo/meson.build:1:0: ERROR: Value \"1\" (of type \"number\") for combo option \"Optimization level\" is not one of the choices. Possible choices are (as string): \"plain\", \"0\", \"g\", \"1\", \"2\", \"3\", \"s\"." }
   ]
 }
diff --git a/test cases/failing/100 bool in combo/meson.build b/test cases/failing/99 bool in combo/meson.build
similarity index 100%
rename from test cases/failing/100 bool in combo/meson.build
rename to test cases/failing/99 bool in combo/meson.build
diff --git a/test cases/failing/100 bool in combo/meson_options.txt b/test cases/failing/99 bool in combo/meson_options.txt
similarity index 100%
rename from test cases/failing/100 bool in combo/meson_options.txt
rename to test cases/failing/99 bool in combo/meson_options.txt
diff --git a/test cases/failing/100 bool in combo/nativefile.ini b/test cases/failing/99 bool in combo/nativefile.ini
similarity index 100%
rename from test cases/failing/100 bool in combo/nativefile.ini
rename to test cases/failing/99 bool in combo/nativefile.ini
diff --git a/test cases/failing/99 bool in combo/test.json b/test cases/failing/99 bool in combo/test.json
new file mode 100644
index 0000000..364dde8
--- /dev/null
+++ b/test cases/failing/99 bool in combo/test.json
@@ -0,0 +1,5 @@
+{
+  "stdout": [
+    { "line": "test cases/failing/99 bool in combo/meson.build:1:0: ERROR: Value \"True\" (of type \"boolean\") for combo option \"opt\" is not one of the choices. Possible choices are (as string): \"true\", \"false\"." }
+  ]
+}
diff --git a/unittests/allplatformstests.py b/unittests/allplatformstests.py
index 1064e6a..2475b17 100644
--- a/unittests/allplatformstests.py
+++ b/unittests/allplatformstests.py
@@ -2317,9 +2317,9 @@
         for (t, f) in [
             ('10 out of bounds', 'meson.build'),
             ('18 wrong plusassign', 'meson.build'),
-            ('57 bad option argument', 'meson_options.txt'),
-            ('95 subdir parse error', os.path.join('subdir', 'meson.build')),
-            ('96 invalid option file', 'meson_options.txt'),
+            ('56 bad option argument', 'meson_options.txt'),
+            ('94 subdir parse error', os.path.join('subdir', 'meson.build')),
+            ('95 invalid option file', 'meson_options.txt'),
         ]:
             tdir = os.path.join(self.src_root, 'test cases', 'failing', t)