diff --git a/.gitmodules b/.gitmodules
index b2b3c872e8..91abefb9d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "tests/wabt"]
-	path = tests/wabt
-	url = https://github.com/WebAssembly/wabt
 [submodule "tests/testsuite"]
 	path = tests/testsuite
 	url = https://github.com/WebAssembly/testsuite
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast.json b/tests/snapshots/testsuite/proposals/annotations/token.wast.json
new file mode 100644
index 0000000000..433baff4c6
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast.json
@@ -0,0 +1,362 @@
+{
+  "source_filename": "tests/testsuite/proposals/annotations/token.wast",
+  "commands": [
+    {
+      "type": "assert_malformed",
+      "line": 4,
+      "filename": "token.0.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 8,
+      "filename": "token.1.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 15,
+      "filename": "token.2.wasm"
+    },
+    {
+      "type": "module",
+      "line": 18,
+      "filename": "token.3.wasm"
+    },
+    {
+      "type": "module",
+      "line": 21,
+      "filename": "token.4.wasm"
+    },
+    {
+      "type": "module",
+      "line": 24,
+      "filename": "token.5.wasm"
+    },
+    {
+      "type": "module",
+      "line": 27,
+      "filename": "token.6.wasm"
+    },
+    {
+      "type": "module",
+      "line": 30,
+      "filename": "token.7.wasm"
+    },
+    {
+      "type": "module",
+      "line": 33,
+      "filename": "token.8.wasm"
+    },
+    {
+      "type": "module",
+      "line": 38,
+      "filename": "token.9.wasm"
+    },
+    {
+      "type": "module",
+      "line": 43,
+      "filename": "token.10.wasm"
+    },
+    {
+      "type": "module",
+      "line": 47,
+      "filename": "token.11.wasm"
+    },
+    {
+      "type": "module",
+      "line": 54,
+      "filename": "token.12.wasm"
+    },
+    {
+      "type": "module",
+      "line": 58,
+      "filename": "token.13.wasm"
+    },
+    {
+      "type": "module",
+      "line": 62,
+      "filename": "token.14.wasm"
+    },
+    {
+      "type": "module",
+      "line": 66,
+      "filename": "token.15.wasm"
+    },
+    {
+      "type": "module",
+      "line": 70,
+      "filename": "token.16.wasm"
+    },
+    {
+      "type": "module",
+      "line": 74,
+      "filename": "token.17.wasm"
+    },
+    {
+      "type": "module",
+      "line": 82,
+      "filename": "token.18.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 86,
+      "filename": "token.19.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 92,
+      "filename": "token.20.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 98,
+      "filename": "token.21.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 102,
+      "filename": "token.22.wat",
+      "text": "unknown label",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 108,
+      "filename": "token.23.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 114,
+      "filename": "token.24.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 118,
+      "filename": "token.25.wat",
+      "text": "unknown label",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 124,
+      "filename": "token.26.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 130,
+      "filename": "token.27.wasm"
+    },
+    {
+      "type": "module",
+      "line": 133,
+      "filename": "token.28.wasm"
+    },
+    {
+      "type": "module",
+      "line": 140,
+      "filename": "token.29.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 144,
+      "filename": "token.30.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 150,
+      "filename": "token.31.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 154,
+      "filename": "token.32.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 160,
+      "filename": "token.33.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 164,
+      "filename": "token.34.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 170,
+      "filename": "token.35.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 174,
+      "filename": "token.36.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 180,
+      "filename": "token.37.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 184,
+      "filename": "token.38.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 190,
+      "filename": "token.39.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 194,
+      "filename": "token.40.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 200,
+      "filename": "token.41.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 204,
+      "filename": "token.42.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 210,
+      "filename": "token.43.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 214,
+      "filename": "token.44.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 220,
+      "filename": "token.45.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 224,
+      "filename": "token.46.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 230,
+      "filename": "token.47.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 234,
+      "filename": "token.48.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 240,
+      "filename": "token.49.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 244,
+      "filename": "token.50.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 250,
+      "filename": "token.51.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 254,
+      "filename": "token.52.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 260,
+      "filename": "token.53.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 264,
+      "filename": "token.54.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "module",
+      "line": 270,
+      "filename": "token.55.wasm"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 274,
+      "filename": "token.56.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 282,
+      "filename": "token.57.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 288,
+      "filename": "token.58.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 294,
+      "filename": "token.59.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    },
+    {
+      "type": "assert_malformed",
+      "line": 300,
+      "filename": "token.60.wat",
+      "text": "unknown operator",
+      "module_type": "text"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/10.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/10.print
new file mode 100644
index 0000000000..cae38e7f31
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/10.print
@@ -0,0 +1,4 @@
+(module
+  (memory (;0;) 1)
+  (data (;0;) (i32.const 0) "a")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/11.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/11.print
new file mode 100644
index 0000000000..3114335627
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/11.print
@@ -0,0 +1,4 @@
+(module
+  (type (;0;) (func))
+  (import "spectest" "print" (func (;0;) (type 0)))
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/12.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/12.print
new file mode 100644
index 0000000000..ad3c1ce924
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/12.print
@@ -0,0 +1,4 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0))
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/13.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/13.print
new file mode 100644
index 0000000000..209d4649e4
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/13.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/14.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/14.print
new file mode 100644
index 0000000000..209d4649e4
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/14.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/15.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/15.print
new file mode 100644
index 0000000000..5f0308e0c0
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/15.print
@@ -0,0 +1,4 @@
+(module
+  (type (;0;) (func))
+  (func $f (;0;) (type 0))
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/16.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/16.print
new file mode 100644
index 0000000000..a88d757707
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/16.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    br 0
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/17.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/17.print
new file mode 100644
index 0000000000..22199110ac
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/17.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "a")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/18.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/18.print
new file mode 100644
index 0000000000..702b5805a6
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/18.print
@@ -0,0 +1,9 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    block $l
+      i32.const 0
+      br_table $l $l
+    end
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/2.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/2.print
new file mode 100644
index 0000000000..209d4649e4
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/2.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/21.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/21.print
new file mode 100644
index 0000000000..702b5805a6
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/21.print
@@ -0,0 +1,9 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    block $l
+      i32.const 0
+      br_table $l $l
+    end
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/24.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/24.print
new file mode 100644
index 0000000000..702b5805a6
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/24.print
@@ -0,0 +1,9 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    block $l
+      i32.const 0
+      br_table $l $l
+    end
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/27.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/27.print
new file mode 100644
index 0000000000..68452d4ab4
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/27.print
@@ -0,0 +1,9 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    block $l0
+      i32.const 0
+      br_table $l0
+    end
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/28.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/28.print
new file mode 100644
index 0000000000..cfc3226015
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/28.print
@@ -0,0 +1,9 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    block $l$l
+      i32.const 0
+      br_table $l$l
+    end
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/29.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/29.print
new file mode 100644
index 0000000000..22199110ac
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/29.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "a")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/3.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/3.print
new file mode 100644
index 0000000000..f449ba99d2
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/3.print
@@ -0,0 +1,7 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    nop
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/31.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/31.print
new file mode 100644
index 0000000000..c201b01707
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/31.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) "a")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/33.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/33.print
new file mode 100644
index 0000000000..88b54b9902
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/33.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) " a")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/35.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/35.print
new file mode 100644
index 0000000000..9b961712b2
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/35.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) "a ")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/37.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/37.print
new file mode 100644
index 0000000000..e25fd8901e
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/37.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) "a b")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/39.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/39.print
new file mode 100644
index 0000000000..5ca5d72f12
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/39.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) "\ef\98\9a\ef\92\a9")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/4.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/4.print
new file mode 100644
index 0000000000..f449ba99d2
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/4.print
@@ -0,0 +1,7 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    nop
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/41.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/41.print
new file mode 100644
index 0000000000..9bd4c5f00e
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/41.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) " \ef\98\9a\ef\92\a9")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/43.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/43.print
new file mode 100644
index 0000000000..54a799915b
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/43.print
@@ -0,0 +1,3 @@
+(module
+  (data $l (;0;) "\ef\98\9a\ef\92\a9 ")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/45.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/45.print
new file mode 100644
index 0000000000..a7868c9ed4
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/45.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "ab")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/47.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/47.print
new file mode 100644
index 0000000000..0f92a8af85
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/47.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "a b")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/49.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/49.print
new file mode 100644
index 0000000000..0f92a8af85
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/49.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "a b")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/5.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/5.print
new file mode 100644
index 0000000000..f449ba99d2
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/5.print
@@ -0,0 +1,7 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    nop
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/51.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/51.print
new file mode 100644
index 0000000000..55cccd8ede
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/51.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "\ef\98\9a\ef\92\a9\ef\98\9a\ef\92\a9")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/53.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/53.print
new file mode 100644
index 0000000000..5035b33adf
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/53.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "\ef\98\9a\ef\92\a9 \ef\98\9a\ef\92\a9")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/55.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/55.print
new file mode 100644
index 0000000000..5035b33adf
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/55.print
@@ -0,0 +1,3 @@
+(module
+  (data (;0;) "\ef\98\9a\ef\92\a9 \ef\98\9a\ef\92\a9")
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/6.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/6.print
new file mode 100644
index 0000000000..be3cd81cdc
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/6.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func $f (;0;) (type 0)
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/7.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/7.print
new file mode 100644
index 0000000000..e2a50d7c2b
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/7.print
@@ -0,0 +1,7 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0)
+    br 0
+    nop
+  )
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/8.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/8.print
new file mode 100644
index 0000000000..357849fd3d
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/8.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func (;0;) (type 0))
+  (table (;0;) 1 funcref)
+  (elem (;0;) (i32.const 0) func 0)
+)
diff --git a/tests/snapshots/testsuite/proposals/annotations/token.wast/9.print b/tests/snapshots/testsuite/proposals/annotations/token.wast/9.print
new file mode 100644
index 0000000000..40b3ac599a
--- /dev/null
+++ b/tests/snapshots/testsuite/proposals/annotations/token.wast/9.print
@@ -0,0 +1,6 @@
+(module
+  (type (;0;) (func))
+  (func $f (;0;) (type 0))
+  (table (;0;) 1 funcref)
+  (elem (;0;) (i32.const 0) func $f)
+)
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast.json b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast.json
index 1692eea565..1833f06a0c 100644
--- a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast.json
+++ b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast.json
@@ -18,7 +18,7 @@
     },
     {
       "type": "assert_return",
-      "line": 243,
+      "line": 247,
       "action": {
         "type": "invoke",
         "field": "simple-throw-catch",
@@ -38,7 +38,7 @@
     },
     {
       "type": "assert_return",
-      "line": 244,
+      "line": 248,
       "action": {
         "type": "invoke",
         "field": "simple-throw-catch",
@@ -58,7 +58,7 @@
     },
     {
       "type": "assert_trap",
-      "line": 246,
+      "line": 250,
       "action": {
         "type": "invoke",
         "field": "unreachable-not-caught",
@@ -68,7 +68,7 @@
     },
     {
       "type": "assert_return",
-      "line": 248,
+      "line": 252,
       "action": {
         "type": "invoke",
         "field": "trap-in-callee",
@@ -92,7 +92,7 @@
     },
     {
       "type": "assert_trap",
-      "line": 249,
+      "line": 253,
       "action": {
         "type": "invoke",
         "field": "trap-in-callee",
@@ -111,7 +111,7 @@
     },
     {
       "type": "assert_return",
-      "line": 251,
+      "line": 255,
       "action": {
         "type": "invoke",
         "field": "catch-complex-1",
@@ -131,7 +131,7 @@
     },
     {
       "type": "assert_return",
-      "line": 252,
+      "line": 256,
       "action": {
         "type": "invoke",
         "field": "catch-complex-1",
@@ -151,7 +151,7 @@
     },
     {
       "type": "assert_exception",
-      "line": 253,
+      "line": 257,
       "action": {
         "type": "invoke",
         "field": "catch-complex-1",
@@ -165,7 +165,7 @@
     },
     {
       "type": "assert_return",
-      "line": 255,
+      "line": 259,
       "action": {
         "type": "invoke",
         "field": "catch-complex-2",
@@ -185,7 +185,7 @@
     },
     {
       "type": "assert_return",
-      "line": 256,
+      "line": 260,
       "action": {
         "type": "invoke",
         "field": "catch-complex-2",
@@ -205,7 +205,7 @@
     },
     {
       "type": "assert_exception",
-      "line": 257,
+      "line": 261,
       "action": {
         "type": "invoke",
         "field": "catch-complex-2",
@@ -219,7 +219,7 @@
     },
     {
       "type": "assert_return",
-      "line": 259,
+      "line": 263,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-i32",
@@ -239,7 +239,7 @@
     },
     {
       "type": "assert_return",
-      "line": 260,
+      "line": 264,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-i32",
@@ -259,7 +259,7 @@
     },
     {
       "type": "assert_return",
-      "line": 261,
+      "line": 265,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-i32",
@@ -279,7 +279,7 @@
     },
     {
       "type": "assert_return",
-      "line": 263,
+      "line": 267,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-f32",
@@ -299,7 +299,7 @@
     },
     {
       "type": "assert_return",
-      "line": 264,
+      "line": 268,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-f32",
@@ -319,7 +319,7 @@
     },
     {
       "type": "assert_return",
-      "line": 266,
+      "line": 270,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-i64",
@@ -339,7 +339,7 @@
     },
     {
       "type": "assert_return",
-      "line": 267,
+      "line": 271,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-i64",
@@ -359,7 +359,7 @@
     },
     {
       "type": "assert_return",
-      "line": 268,
+      "line": 272,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-i64",
@@ -379,7 +379,7 @@
     },
     {
       "type": "assert_return",
-      "line": 270,
+      "line": 274,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-f64",
@@ -399,7 +399,7 @@
     },
     {
       "type": "assert_return",
-      "line": 271,
+      "line": 275,
       "action": {
         "type": "invoke",
         "field": "throw-catch-param-f64",
@@ -419,7 +419,7 @@
     },
     {
       "type": "assert_return",
-      "line": 273,
+      "line": 277,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-i32",
@@ -439,7 +439,7 @@
     },
     {
       "type": "assert_return",
-      "line": 274,
+      "line": 278,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-i32",
@@ -459,7 +459,7 @@
     },
     {
       "type": "assert_return",
-      "line": 275,
+      "line": 279,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-i32",
@@ -479,7 +479,7 @@
     },
     {
       "type": "assert_return",
-      "line": 277,
+      "line": 281,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-f32",
@@ -499,7 +499,7 @@
     },
     {
       "type": "assert_return",
-      "line": 278,
+      "line": 282,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-f32",
@@ -519,7 +519,7 @@
     },
     {
       "type": "assert_return",
-      "line": 280,
+      "line": 284,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-i64",
@@ -539,7 +539,7 @@
     },
     {
       "type": "assert_return",
-      "line": 281,
+      "line": 285,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-i64",
@@ -559,7 +559,7 @@
     },
     {
       "type": "assert_return",
-      "line": 282,
+      "line": 286,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-i64",
@@ -579,7 +579,7 @@
     },
     {
       "type": "assert_return",
-      "line": 284,
+      "line": 288,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-f64",
@@ -599,7 +599,7 @@
     },
     {
       "type": "assert_return",
-      "line": 285,
+      "line": 289,
       "action": {
         "type": "invoke",
         "field": "throw-catch_ref-param-f64",
@@ -619,7 +619,7 @@
     },
     {
       "type": "assert_return",
-      "line": 287,
+      "line": 291,
       "action": {
         "type": "invoke",
         "field": "catch-param-i32",
@@ -639,7 +639,7 @@
     },
     {
       "type": "assert_return",
-      "line": 289,
+      "line": 293,
       "action": {
         "type": "invoke",
         "field": "catch-imported",
@@ -654,7 +654,7 @@
     },
     {
       "type": "assert_return",
-      "line": 291,
+      "line": 295,
       "action": {
         "type": "invoke",
         "field": "catchless-try",
@@ -674,7 +674,7 @@
     },
     {
       "type": "assert_return",
-      "line": 292,
+      "line": 296,
       "action": {
         "type": "invoke",
         "field": "catchless-try",
@@ -694,7 +694,7 @@
     },
     {
       "type": "assert_exception",
-      "line": 294,
+      "line": 298,
       "action": {
         "type": "invoke",
         "field": "return-call-in-try-catch",
@@ -703,21 +703,31 @@
     },
     {
       "type": "assert_exception",
-      "line": 295,
+      "line": 299,
       "action": {
         "type": "invoke",
         "field": "return-call-indirect-in-try-catch",
         "args": []
       }
     },
+    {
+      "type": "assert_return",
+      "line": 301,
+      "action": {
+        "type": "invoke",
+        "field": "try-with-param",
+        "args": []
+      },
+      "expected": []
+    },
     {
       "type": "module",
-      "line": 297,
+      "line": 303,
       "filename": "try_table.2.wasm"
     },
     {
       "type": "assert_return",
-      "line": 319,
+      "line": 325,
       "action": {
         "type": "invoke",
         "field": "imported-mismatch",
@@ -732,68 +742,68 @@
     },
     {
       "type": "assert_malformed",
-      "line": 322,
+      "line": 328,
       "filename": "try_table.3.wat",
       "text": "unexpected token",
       "module_type": "text"
     },
     {
       "type": "assert_malformed",
-      "line": 327,
+      "line": 333,
       "filename": "try_table.4.wat",
       "text": "unexpected token",
       "module_type": "text"
     },
     {
       "type": "module",
-      "line": 331,
+      "line": 337,
       "filename": "try_table.5.wasm"
     },
     {
       "type": "assert_invalid",
-      "line": 342,
+      "line": 348,
       "filename": "try_table.6.wasm",
       "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 346,
+      "line": 352,
       "filename": "try_table.7.wasm",
       "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 351,
+      "line": 357,
       "filename": "try_table.8.wasm",
       "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 355,
+      "line": 361,
       "filename": "try_table.9.wasm",
       "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 359,
+      "line": 365,
       "filename": "try_table.10.wasm",
       "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 363,
+      "line": 369,
       "filename": "try_table.11.wasm",
       "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 367,
+      "line": 373,
       "filename": "try_table.12.wasm",
       "text": "type mismatch",
       "module_type": "binary"
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print
index af85649a99..491684ac45 100644
--- a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print
+++ b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/2.print
@@ -266,6 +266,12 @@
       end
     end
   )
+  (func (;23;) (type 0)
+    i32.const 0
+    try_table (type 1) (param i32) ;; label = @1
+      drop
+    end
+  )
   (table (;0;) 1 1 funcref)
   (tag $e0 (;1;) (type 0))
   (tag $e1 (;2;) (type 0))
@@ -292,5 +298,6 @@
   (export "catchless-try" (func 19))
   (export "return-call-in-try-catch" (func 21))
   (export "return-call-indirect-in-try-catch" (func 22))
+  (export "try-with-param" (func 23))
   (elem (;0;) (i32.const 0) func $throw-void)
 )
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/40.print b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/41.print
similarity index 100%
rename from tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/40.print
rename to tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/41.print
diff --git a/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/44.print b/tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/45.print
similarity index 100%
rename from tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/44.print
rename to tests/snapshots/testsuite/proposals/exception-handling/try_table.wast/45.print
diff --git a/tests/snapshots/testsuite/proposals/gc/call_ref.wast.json b/tests/snapshots/testsuite/proposals/gc/call_ref.wast.json
index aecff932a6..f867139576 100644
--- a/tests/snapshots/testsuite/proposals/gc/call_ref.wast.json
+++ b/tests/snapshots/testsuite/proposals/gc/call_ref.wast.json
@@ -557,6 +557,13 @@
       "filename": "call_ref.6.wasm",
       "text": "type mismatch",
       "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 211,
+      "filename": "call_ref.7.wasm",
+      "text": "type mismatch",
+      "module_type": "binary"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/return_call.wast.json b/tests/snapshots/testsuite/proposals/gc/return_call.wast.json
index 83ce2217d2..224c56631a 100644
--- a/tests/snapshots/testsuite/proposals/gc/return_call.wast.json
+++ b/tests/snapshots/testsuite/proposals/gc/return_call.wast.json
@@ -650,17 +650,24 @@
     },
     {
       "type": "assert_invalid",
-      "line": 196,
+      "line": 192,
       "filename": "return_call.11.wasm",
-      "text": "unknown function",
+      "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 200,
+      "line": 204,
       "filename": "return_call.12.wasm",
       "text": "unknown function",
       "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 208,
+      "filename": "return_call.13.wasm",
+      "text": "unknown function",
+      "module_type": "binary"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast.json b/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast.json
index b4224ba028..3342d86fbe 100644
--- a/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast.json
+++ b/tests/snapshots/testsuite/proposals/gc/return_call_indirect.wast.json
@@ -1048,22 +1048,29 @@
     },
     {
       "type": "assert_invalid",
-      "line": 516,
+      "line": 512,
       "filename": "return_call_indirect.25.wasm",
-      "text": "unknown type",
+      "text": "type mismatch",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 523,
+      "line": 526,
       "filename": "return_call_indirect.26.wasm",
       "text": "unknown type",
       "module_type": "binary"
     },
     {
       "type": "assert_invalid",
-      "line": 534,
+      "line": 533,
       "filename": "return_call_indirect.27.wasm",
+      "text": "unknown type",
+      "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 544,
+      "filename": "return_call_indirect.28.wasm",
       "text": "unknown function 0",
       "module_type": "binary"
     }
diff --git a/tests/snapshots/testsuite/proposals/gc/return_call_ref.wast.json b/tests/snapshots/testsuite/proposals/gc/return_call_ref.wast.json
index 07ce645b9c..1ccc4ef3ce 100644
--- a/tests/snapshots/testsuite/proposals/gc/return_call_ref.wast.json
+++ b/tests/snapshots/testsuite/proposals/gc/return_call_ref.wast.json
@@ -704,6 +704,20 @@
       "filename": "return_call_ref.13.wasm",
       "text": "type mismatch",
       "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 379,
+      "filename": "return_call_ref.14.wasm",
+      "text": "type mismatch",
+      "module_type": "binary"
+    },
+    {
+      "type": "assert_invalid",
+      "line": 389,
+      "filename": "return_call_ref.15.wasm",
+      "text": "type mismatch",
+      "module_type": "binary"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/testsuite b/tests/testsuite
index e05365077e..53da17c093 160000
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -1 +1 @@
-Subproject commit e05365077e13a1d86ffe77acfb1a835b7aa78422
+Subproject commit 53da17c0936a23f68f97cde4f9346a0a374dc35f