13 files changed, 25 insertions, 25 deletions
diff --git a/test/parse/expr/bad-block-sig-multi.txt b/test/parse/expr/bad-block-sig-multi.txt
index cfb7ffed..294abe4e 100644
--- a/test/parse/expr/bad-block-sig-multi.txt
+++ b/test/parse/expr/bad-block-sig-multi.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module
   (func
-    block i32 i32
+    block (result i32 i32)
       i32.const 1
       i32.const 1
     end
@@ -9,6 +9,6 @@
     drop))
 (;; STDERR ;;;
 out/test/parse/expr/bad-block-sig-multi.txt:4:5: multiple block signature result types not currently supported.
-    block i32 i32
+    block (result i32 i32)
     ^^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/bad-if-sig-multi.txt b/test/parse/expr/bad-if-sig-multi.txt
index 44ef8189..8268553f 100644
--- a/test/parse/expr/bad-if-sig-multi.txt
+++ b/test/parse/expr/bad-if-sig-multi.txt
@@ -2,7 +2,7 @@
 (module
   (func
     i32.const 1
-    if i32 i32
+    if (result i32 i32)
       i32.const 1
       i32.const 2
     else
@@ -13,6 +13,6 @@
     drop))
 (;; STDERR ;;;
 out/test/parse/expr/bad-if-sig-multi.txt:5:5: multiple if signature result types not currently supported.
-    if i32 i32
+    if (result i32 i32)
     ^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/bad-loop-sig-multi.txt b/test/parse/expr/bad-loop-sig-multi.txt
index 5ea5b726..5069d191 100644
--- a/test/parse/expr/bad-loop-sig-multi.txt
+++ b/test/parse/expr/bad-loop-sig-multi.txt
@@ -1,7 +1,7 @@
 ;;; ERROR: 1
 (module
   (func
-    loop i32 i32
+    loop (result i32 i32)
       i32.const 1
       i32.const 2
     end
@@ -9,6 +9,6 @@
     drop))
 (;; STDERR ;;;
 out/test/parse/expr/bad-loop-sig-multi.txt:4:5: multiple loop signature result types not currently supported.
-    loop i32 i32
+    loop (result i32 i32)
     ^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/bad-return-multi.txt b/test/parse/expr/bad-return-multi.txt
index bbcafc05..4738b226 100644
--- a/test/parse/expr/bad-return-multi.txt
+++ b/test/parse/expr/bad-return-multi.txt
@@ -4,7 +4,7 @@
           f32.const 3.14
           return))
 (;; STDERR ;;;
-out/test/parse/expr/bad-return-multi.txt:2:9: multiple result values not currently supported.
+out/test/parse/expr/bad-return-multi.txt:2:10: multiple result values not currently supported.
 (module (func (result f32 f32)
-        ^
+         ^^^^
 ;;; STDERR ;;)
diff --git a/test/parse/expr/block-return.txt b/test/parse/expr/block-return.txt
index d6c96382..6eeae185 100644
--- a/test/parse/expr/block-return.txt
+++ b/test/parse/expr/block-return.txt
@@ -1,6 +1,6 @@
 (module
   (func (result i32)
-    block i32
+    block (result i32)
       nop
       i32.const 1
       return
diff --git a/test/parse/expr/const.txt b/test/parse/expr/const.txt
index 069339a3..1904501c 100644
--- a/test/parse/expr/const.txt
+++ b/test/parse/expr/const.txt
@@ -40,11 +40,11 @@
     drop
     f32.const +nan:0xabc
     drop
-    f32.const infinity
+    f32.const inf
     drop
-    f32.const -infinity
+    f32.const -inf
     drop
-    f32.const +infinity 
+    f32.const +inf
     drop
     f32.const -0x1p-1
     drop
@@ -58,25 +58,25 @@
     drop
     f64.const 6.283185307179586
     drop
-    f64.const nan 
+    f64.const nan
     drop
     f64.const -nan
     drop
     f64.const +nan
     drop
-    f64.const nan:0xabc 
+    f64.const nan:0xabc
     drop
     f64.const -nan:0xabc
     drop
     f64.const +nan:0xabc
     drop
-    f64.const infinity 
+    f64.const inf
     drop
-    f64.const -infinity
+    f64.const -inf
     drop
-    f64.const +infinity
+    f64.const +inf
     drop
-    f64.const -0x1p-1 
+    f64.const -0x1p-1
     drop
     f64.const 0x1.921fb54442d18p+2
     drop))
diff --git a/test/parse/expr/expr-br.txt b/test/parse/expr/expr-br.txt
index c64a9d7d..4276bab3 100644
--- a/test/parse/expr/expr-br.txt
+++ b/test/parse/expr/expr-br.txt
@@ -1,6 +1,6 @@
 (module
   (func (result i32)
-    block $exit i32
+    block $exit (result i32)
       i32.const 0
       br 0 
     end))
diff --git a/test/parse/expr/expr-brif.txt b/test/parse/expr/expr-brif.txt
index c9ec7311..54b9bddd 100644
--- a/test/parse/expr/expr-brif.txt
+++ b/test/parse/expr/expr-brif.txt
@@ -1,6 +1,6 @@
 (module
   (func (result i32)
-    block $exit i32
+    block $exit (result i32)
       i32.const 0
       i32.const 0
       br_if 0
diff --git a/test/parse/expr/if-return.txt b/test/parse/expr/if-return.txt
index 636b98ce..4a39c5f0 100644
--- a/test/parse/expr/if-return.txt
+++ b/test/parse/expr/if-return.txt
@@ -1,7 +1,7 @@
 (module
   (func (result i32)
     i32.const 1
-    if i32
+    if (result i32)
       i32.const 2
       return
     else
diff --git a/test/parse/expr/if-then-else-br-named.txt b/test/parse/expr/if-then-else-br-named.txt
index 43c49099..6e8ef870 100644
--- a/test/parse/expr/if-then-else-br-named.txt
+++ b/test/parse/expr/if-then-else-br-named.txt
@@ -1,7 +1,7 @@
 (module
   (func (result i32)
     i32.const 1
-    if $exit i32
+    if $exit (result i32)
       i32.const 1
       br $exit
     else
diff --git a/test/parse/expr/if-then-else-br.txt b/test/parse/expr/if-then-else-br.txt
index dcacffcb..91448d3a 100644
--- a/test/parse/expr/if-then-else-br.txt
+++ b/test/parse/expr/if-then-else-br.txt
@@ -1,7 +1,7 @@
 (module
   (func (result i32)
     i32.const 1
-    if i32
+    if (result i32)
       i32.const 1
       br 0
     else
diff --git a/test/parse/expr/return-block.txt b/test/parse/expr/return-block.txt
index 1532030f..526b488a 100644
--- a/test/parse/expr/return-block.txt
+++ b/test/parse/expr/return-block.txt
@@ -1,6 +1,6 @@
 (module
   (func (result i32)
-     block i32
+     block (result i32)
        nop
        i32.const 1
      end
diff --git a/test/parse/expr/return-if.txt b/test/parse/expr/return-if.txt
index 640a912b..abeb3368 100644
--- a/test/parse/expr/return-if.txt
+++ b/test/parse/expr/return-if.txt
@@ -1,7 +1,7 @@
 (module
   (func (result i32)
     i32.const 1
-    if i32
+    if (result i32)
        i32.const 2
     else
        i32.const 3