diff --git a/test/schemas/v0/tests.schema.json b/test/schemas/v0/tests.schema.json
index e3f9e6e4df..0f8a3a8229 100644
--- a/test/schemas/v0/tests.schema.json
+++ b/test/schemas/v0/tests.schema.json
@@ -2,7 +2,7 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema",
   "$id": "https://raw.githubusercontent.com/unicode-org/message-format-wg/main/test/schemas/v0/tests.schema.json",
   "title": "MessageFormat 2 data-driven tests",
-  "description": "This is the main schema for MessageFormat 2 test source data.",
+  "description": "The main schema for MessageFormat 2 test data.",
   "type": "object",
   "additionalProperties": false,
   "required": [
@@ -11,7 +11,7 @@
   "properties": {
     "scenario": {
       "type": "string",
-      "description": "Identifier for the tests in the file"
+      "description": "Identifier for the tests in the file."
     },
     "description": {
       "type": "string",
@@ -351,12 +351,11 @@
               "unresolved-variable",
               "unknown-function",
               "unsupported-expression",
-              "invalid-expression",
-              "operand-mismatch",
               "unsupported-statement",
-              "selection-error",
-              "formatting-error",
-              "bad-input"
+              "bad-selector",
+              "bad-operand",
+              "bad-option",
+              "bad-variant-key"
             ]
           }
         }
diff --git a/test/tests/functions/date.json b/test/tests/functions/date.json
index 472b46d861..8252ab8bdf 100644
--- a/test/tests/functions/date.json
+++ b/test/tests/functions/date.json
@@ -11,7 +11,7 @@
       "exp": "{:date}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -20,7 +20,7 @@
       "exp": "{|horse|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },
diff --git a/test/tests/functions/datetime.json b/test/tests/functions/datetime.json
index 18e0cd9744..677a3853df 100644
--- a/test/tests/functions/datetime.json
+++ b/test/tests/functions/datetime.json
@@ -11,7 +11,7 @@
       "exp": "{:datetime}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -26,7 +26,7 @@
       ],
       "expErrors": [
         {
-          "type": "bad-input"
+          "type": "bad-operand"
         }
       ]
     },
@@ -35,7 +35,7 @@
       "exp": "{|horse|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },
diff --git a/test/tests/functions/number.json b/test/tests/functions/number.json
index 515600c458..4f5fcf5ada 100644
--- a/test/tests/functions/number.json
+++ b/test/tests/functions/number.json
@@ -22,7 +22,7 @@
       "exp": "hello {|foo|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },
@@ -31,7 +31,7 @@
       "exp": "invalid number literal {|.1|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -40,7 +40,7 @@
       "exp": "invalid number literal {|1.|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -49,7 +49,7 @@
       "exp": "invalid number literal {|01|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -58,7 +58,7 @@
       "exp": "invalid number literal {|+1|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -67,7 +67,7 @@
       "exp": "invalid number literal {|0x1|}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -76,7 +76,7 @@
       "exp": "hello {:number}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -139,7 +139,7 @@
       "exp": "bar {$bar}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-option"
         }
       ]
     },
@@ -154,7 +154,7 @@
       "exp": "bar {$bar}",
       "expErrors": [
         {
-          "type": "bad-input"
+          "type": "bad-operand"
         }
       ]
     },
@@ -189,7 +189,7 @@
       "exp": "bar {$foo}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-option"
         }
       ]
     },
@@ -204,7 +204,7 @@
       "exp": "bar {$foo}",
       "expErrors": [
         {
-          "type": "bad-input"
+          "type": "bad-operand"
         }
       ]
     },
diff --git a/test/tests/functions/time.json b/test/tests/functions/time.json
index 4c5dd22bb6..201f8fadb1 100644
--- a/test/tests/functions/time.json
+++ b/test/tests/functions/time.json
@@ -11,7 +11,7 @@
       "exp": "{:time}",
       "expErrors": [
         {
-          "type": "invalid-expression"
+          "type": "bad-operand"
         }
       ]
     },
@@ -20,7 +20,7 @@
       "exp": "{|horse|}",
       "expErrors": [
         {
-          "type": "operand-mismatch"
+          "type": "bad-operand"
         }
       ]
     },