21 files changed, 98 insertions, 98 deletions
diff --git a/test/passes/O.txt b/test/passes/O.txt
index 855e736ff..531712311 100644
--- a/test/passes/O.txt
+++ b/test/passes/O.txt
@@ -1,6 +1,6 @@
 (module
-  (memory $0 0)
   (type $0 (func (result i32)))
+  (memory $0 0)
   (func $ret (type $0) (result i32)
     (block $out i32
       (drop
diff --git a/test/passes/coalesce-locals-learning.txt b/test/passes/coalesce-locals-learning.txt
index ae9843094..49afc98ec 100644
--- a/test/passes/coalesce-locals-learning.txt
+++ b/test/passes/coalesce-locals-learning.txt
@@ -1,11 +1,11 @@
 (module
-  (memory $0 10)
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $2 (func))
   (type $3 (func (param i32 f32)))
   (type $4 (func (param i32)))
   (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32)))
+  (memory $0 10)
   (func $nothing-to-do (type $2)
     (local $0 i32)
     (nop)
diff --git a/test/passes/coalesce-locals.txt b/test/passes/coalesce-locals.txt
index 4306adef8..1f89b9fa7 100644
--- a/test/passes/coalesce-locals.txt
+++ b/test/passes/coalesce-locals.txt
@@ -1,11 +1,11 @@
 (module
-  (memory $0 10)
   (type $FUNCSIG$iiii (func (param i32 i32 i32) (result i32)))
   (type $FUNCSIG$iii (func (param i32 i32) (result i32)))
   (type $2 (func))
   (type $3 (func (param i32 f32)))
   (type $4 (func (param i32)))
   (import "env" "_emscripten_autodebug_i32" (func $_emscripten_autodebug_i32 (param i32 i32) (result i32)))
+  (memory $0 10)
   (func $nothing-to-do (type $2)
     (local $0 i32)
     (nop)
diff --git a/test/passes/dce.txt b/test/passes/dce.txt
index 4128a9c98..edcaaa749 100644
--- a/test/passes/dce.txt
+++ b/test/passes/dce.txt
@@ -1,11 +1,11 @@
 (module
-  (memory $0 10)
   (type $ii (func (param i32 i32)))
   (type $1 (func))
   (type $2 (func (result i32)))
   (type $3 (func (param i32) (result i32)))
   (table 1 1 anyfunc)
   (elem (i32.const 0) $call-me)
+  (memory $0 10)
   (func $call-me (type $ii) (param $0 i32) (param $1 i32)
     (nop)
   )
diff --git a/test/passes/dce_vacuum.txt b/test/passes/dce_vacuum.txt
index 876eb3c34..8009fa89f 100644
--- a/test/passes/dce_vacuum.txt
+++ b/test/passes/dce_vacuum.txt
@@ -1,6 +1,6 @@
 (module
-  (memory $0 0)
   (type $0 (func (result i32)))
+  (memory $0 0)
   (func $__Z12serveroptionPc (type $0) (result i32)
     (block $switch$0
       (return
diff --git a/test/passes/duplicate-function-elimination.txt b/test/passes/duplicate-function-elimination.txt
index 5d827d134..7c30dfa64 100644
--- a/test/passes/duplicate-function-elimination.txt
+++ b/test/passes/duplicate-function-elimination.txt
@@ -1,13 +1,13 @@
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (nop)
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (i32.const 0)
@@ -18,8 +18,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (drop
       (i32.const 0)
@@ -27,8 +27,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (i32.const 0)
@@ -41,13 +41,13 @@
   )
 )
 (module
-  (memory $0 0)
-  (start $keep2)
   (type $0 (func))
-  (export "keep2" (func $keep2))
-  (export "other" (func $keep2))
   (table 3 3 anyfunc)
   (elem (i32.const 0) $keep2 $keep2 $caller)
+  (memory $0 0)
+  (export "keep2" (func $keep2))
+  (export "other" (func $keep2))
+  (start $keep2)
   (func $keep2 (type $0)
     (nop)
   )
@@ -57,8 +57,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2-after-two-passes (type $0)
     (nop)
   )
@@ -67,8 +67,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep-4 (type $0)
     (nop)
   )
@@ -83,11 +83,11 @@
   )
 )
 (module
-  (memory $0 0)
   (type $T (func (result i32)))
   (type $S (func (result i32)))
   (type $2 (func))
   (type $3 (func (param i32)))
+  (memory $0 0)
   (func $keep4-similar-but-func-sig-differs (type $2)
     (drop
       (i32.const 0)
@@ -106,9 +106,9 @@
   )
 )
 (module
-  (memory $0 0)
   (type $S (func (result i32)))
   (type $1 (func (param i32)))
+  (memory $0 0)
   (func $keep2-similar-but-func-sig-differs (type $1) (param $i i32)
     (drop
       (i32.const 0)
@@ -119,8 +119,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (nop)
   )
@@ -130,16 +130,16 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (block $block0
     )
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $block0
     )
@@ -151,8 +151,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (block $block0
       (nop)
@@ -160,8 +160,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $block0
       (nop)
@@ -175,8 +175,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $block0
       (nop)
@@ -189,16 +189,16 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase-since-block-names-do-not-matter (type $0)
     (block $foo
     )
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase-since-block-names-do-not-matter (type $0)
     (block $foo
       (br $foo)
@@ -209,8 +209,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $foo
       (block $block
@@ -233,8 +233,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $foo
       (br_if $foo
@@ -251,8 +251,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (block $foo
       (br_if $foo
@@ -262,8 +262,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $foo
       (br_table $foo $foo
@@ -280,8 +280,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (loop $bar
       (nop)
@@ -289,8 +289,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (block $foo i32
@@ -313,8 +313,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (block $foo
       (block $bar
@@ -326,8 +326,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (block $foo
       (block $bar
@@ -348,15 +348,15 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (call $erase)
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2-but-in-theory-we-could-erase (type $0)
     (call $keep2-but-in-theory-we-could-erase)
   )
@@ -365,19 +365,19 @@
   )
 )
 (module
-  (memory $0 0)
   (type $FUNCSIG$v (func))
   (import "env" "i" (func $i))
   (import "env" "j" (func $j))
+  (memory $0 0)
   (func $erase (type $FUNCSIG$v)
     (call $i)
   )
 )
 (module
-  (memory $0 0)
   (type $FUNCSIG$v (func))
   (import "env" "i" (func $i))
   (import "env" "j" (func $j))
+  (memory $0 0)
   (func $keep2 (type $FUNCSIG$v)
     (call $i)
   )
@@ -386,10 +386,10 @@
   )
 )
 (module
-  (memory $0 0)
   (type $T (func))
   (table 2 2 anyfunc)
   (elem (i32.const 0) $erase $erase)
+  (memory $0 0)
   (func $erase (type $T)
     (call_indirect $T
       (i32.const 0)
@@ -397,10 +397,10 @@
   )
 )
 (module
-  (memory $0 0)
   (type $T (func))
   (table 2 2 anyfunc)
   (elem (i32.const 0) $keep2 $other)
+  (memory $0 0)
   (func $keep2 (type $T)
     (call_indirect $T
       (i32.const 0)
@@ -413,11 +413,11 @@
   )
 )
 (module
-  (memory $0 0)
   (type $T (func))
   (type $S (func))
   (table 2 2 anyfunc)
   (elem (i32.const 0) $keep2 $other)
+  (memory $0 0)
   (func $keep2 (type $T)
     (call_indirect $T
       (i32.const 0)
@@ -430,8 +430,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase-even-locals-with-different-names (type $0)
     (local $i i32)
     (drop
@@ -440,8 +440,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (local $i i32)
     (drop
@@ -456,8 +456,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase-even-locals-with-different-names (type $0)
     (local $i i32)
     (set_local $i
@@ -466,8 +466,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (local $i i32)
     (set_local $i
@@ -482,8 +482,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (local $i i32)
     (set_local $i
@@ -498,8 +498,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $erase (type $0)
     (drop
       (i32.load
@@ -514,8 +514,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (drop
       (i32.load offset=3
@@ -532,8 +532,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (drop
       (i32.load16_s offset=3
@@ -550,8 +550,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (drop
       (i32.load16_s
@@ -568,8 +568,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (drop
       (i32.load16_s offset=3
@@ -586,8 +586,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (drop
       (i32.load16_u offset=3
@@ -604,8 +604,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $erase (type $0)
     (i32.store
       (i32.const 0)
@@ -618,8 +618,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (i32.store offset=3
       (i32.const 0)
@@ -634,8 +634,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (i32.store16 offset=3
       (i32.const 0)
@@ -650,8 +650,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (i32.store16
       (i32.const 0)
@@ -666,8 +666,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (i32.store16 offset=3
       (i32.const 0)
@@ -682,8 +682,8 @@
   )
 )
 (module
-  (memory $0 10)
   (type $0 (func))
+  (memory $0 10)
   (func $keep2 (type $0)
     (i32.store16 offset=3
       (i32.const 0)
@@ -698,8 +698,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (i32.const 0)
@@ -712,8 +712,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (i32.const 0)
@@ -726,8 +726,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (i32.const 0)
@@ -740,8 +740,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (i64.const 0)
@@ -754,8 +754,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f32.const 0.10000000149011612)
@@ -768,8 +768,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f64.const 0.1)
@@ -782,8 +782,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (drop
       (f32.abs
@@ -793,8 +793,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f32.abs
@@ -811,8 +811,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f32.abs
@@ -829,8 +829,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (drop
       (f32.add
@@ -841,8 +841,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f32.add
@@ -861,8 +861,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f32.add
@@ -881,8 +881,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep2 (type $0)
     (drop
       (f32.add
@@ -901,8 +901,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (drop
       (select
@@ -914,8 +914,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep (type $0)
     (drop
       (select
@@ -936,8 +936,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep (type $0)
     (drop
       (select
@@ -958,8 +958,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep (type $0)
     (drop
       (select
@@ -980,15 +980,15 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (return)
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func (result i32)))
+  (memory $0 0)
   (func $erase (type $0) (result i32)
     (return
       (i32.const 0)
@@ -996,8 +996,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func (result i32)))
+  (memory $0 0)
   (func $keep (type $0) (result i32)
     (return
       (i32.const 0)
@@ -1010,8 +1010,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (drop
       (current_memory)
@@ -1019,8 +1019,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $erase (type $0)
     (drop
       (grow_memory
@@ -1030,8 +1030,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep (type $0)
     (drop
       (grow_memory
@@ -1048,8 +1048,8 @@
   )
 )
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $keep (type $0)
     (drop
       (current_memory)
diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt
index 24a2dd381..041c79872 100644
--- a/test/passes/metrics.txt
+++ b/test/passes/metrics.txt
@@ -8,8 +8,8 @@ Counts
  drop           : 6       
  if             : 4       
 (module
-  (memory $0 256 256)
   (type $0 (func (param i32)))
+  (memory $0 256 256)
   (func $ifs (type $0) (param $x i32)
     (local $y f32)
     (block $block0
diff --git a/test/passes/nm.txt b/test/passes/nm.txt
index ebd12edd4..00bdf4a6c 100644
--- a/test/passes/nm.txt
+++ b/test/passes/nm.txt
@@ -2,8 +2,8 @@
     $b : 5
     $c : 13
 (module
-  (memory $0 0)
   (type $0 (func))
+  (memory $0 0)
   (func $a (type $0)
     (nop)
   )
diff --git a/test/passes/optimize-instructions.txt b/test/passes/optimize-instructions.txt
index 611b16e41..bda6fd97f 100644
--- a/test/passes/optimize-instructions.txt
+++ b/test/passes/optimize-instructions.txt
@@ -1,6 +1,6 @@
 (module
-  (memory $0 0)
   (type $0 (func (param i32 i64)))
+  (memory $0 0)
   (func $f (type $0) (param $i1 i32) (param $i2 i64)
     (if
       (i32.eqz
diff --git a/test/passes/post-emscripten.txt b/test/passes/post-emscripten.txt
index f51111524..a2acbbb28 100644
--- a/test/passes/post-emscripten.txt
+++ b/test/passes/post-emscripten.txt
@@ -1,6 +1,6 @@
 (module
-  (memory $0 256 256)
   (type $0 (func (param i32)))
+  (memory $0 256 256)
   (func $b0 (type $0) (param $x i32)
     (drop
       (i32.load offset=1
diff --git a/test/passes/precompute.txt b/test/passes/precompute.txt
index de18b9721..e7fc6526f 100644
--- a/test/passes/precompute.txt
+++ b/test/passes/precompute.txt
@@ -1,8 +1,8 @@
 (module
-  (memory $0 0)
   (type $0 (func (param i32)))
   (type $1 (func (result i32)))
   (type $2 (func))
+  (memory $0 0)
   (func $x (type $0) (param $x i32)
     (nop)
     (drop
diff --git a/test/passes/remove-imports.txt b/test/passes/remove-imports.txt
index 9ae45a593..f4fe439bc 100644
--- a/test/passes/remove-imports.txt
+++ b/test/passes/remove-imports.txt
@@ -1,8 +1,8 @@
 (module
-  (memory $0 1024 1024)
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$d (func (result f64)))
+  (memory $0 1024 1024)
   (func $nada (type $FUNCSIG$v)
     (nop)
     (drop
diff --git a/test/passes/remove-unused-brs.txt b/test/passes/remove-unused-brs.txt
index 43da58c88..3661ef9ae 100644
--- a/test/passes/remove-unused-brs.txt
+++ b/test/passes/remove-unused-brs.txt
@@ -1,10 +1,10 @@
 (module
-  (memory $0 256 256)
   (type $0 (func (param i32)))
   (type $1 (func))
   (type $2 (func (result i32)))
   (type $3 (func (param i32 i32) (result i32)))
   (type $4 (func (param i32 i32)))
+  (memory $0 256 256)
   (func $b0-yes (type $0) (param $i1 i32)
     (block $topmost
     )
diff --git a/test/passes/remove-unused-functions.txt b/test/passes/remove-unused-functions.txt
index 5e5aa1349..0e3cef1b9 100644
--- a/test/passes/remove-unused-functions.txt
+++ b/test/passes/remove-unused-functions.txt
@@ -1,10 +1,10 @@
 (module
-  (memory $0 0)
-  (start $start)
   (type $0 (func))
-  (export "exported" (func $exported))
   (table 1 1 anyfunc)
   (elem (i32.const 0) $called_indirect)
+  (memory $0 0)
+  (export "exported" (func $exported))
+  (start $start)
   (func $start (type $0)
     (call $called0)
   )
diff --git a/test/passes/remove-unused-names.txt b/test/passes/remove-unused-names.txt
index a5d2e1f0c..d1399d552 100644
--- a/test/passes/remove-unused-names.txt
+++ b/test/passes/remove-unused-names.txt
@@ -1,7 +1,7 @@
 (module
-  (memory $0 256 256)
   (type $0 (func (param i32) (result i32)))
   (type $1 (func))
+  (memory $0 256 256)
   (func $b0 (type $0) (param $i1 i32) (result i32)
     (i32.const 0)
   )
diff --git a/test/passes/remove-unused-names_merge-blocks.txt b/test/passes/remove-unused-names_merge-blocks.txt
index 55abcfe7f..0d13bcaa3 100644
--- a/test/passes/remove-unused-names_merge-blocks.txt
+++ b/test/passes/remove-unused-names_merge-blocks.txt
@@ -1,11 +1,11 @@
 (module
-  (memory $0 256 256)
   (type $i (func (param i32)))
   (type $ii (func (param i32 i32)))
   (type $iii (func (param i32 i32 i32)))
   (type $3 (func))
   (table 1 1 anyfunc)
   (elem (i32.const 0) $call-i)
+  (memory $0 256 256)
   (func $call-i (type $i) (param $0 i32)
     (nop)
   )
diff --git a/test/passes/remove-unused-names_vacuum.txt b/test/passes/remove-unused-names_vacuum.txt
index 3819fcbec..4da159f92 100644
--- a/test/passes/remove-unused-names_vacuum.txt
+++ b/test/passes/remove-unused-names_vacuum.txt
@@ -1,6 +1,6 @@
 (module
-  (memory $0 0)
   (type $0 (func (result i32)))
+  (memory $0 0)
   (func $return-i32-but-body-is-unreachable3 (type $0) (result i32)
     (local $label i32)
     (unreachable)
diff --git a/test/passes/reorder-functions.txt b/test/passes/reorder-functions.txt
index ae12e0797..db222d6df 100644
--- a/test/passes/reorder-functions.txt
+++ b/test/passes/reorder-functions.txt
@@ -1,6 +1,6 @@
 (module
-  (memory $0 256 256)
   (type $0 (func))
+  (memory $0 256 256)
   (func $c (type $0)
     (call $c)
     (call $c)
diff --git a/test/passes/reorder-locals.txt b/test/passes/reorder-locals.txt
index cd8ca37e5..6c12c9e9e 100644
--- a/test/passes/reorder-locals.txt
+++ b/test/passes/reorder-locals.txt
@@ -1,7 +1,7 @@
 (module
-  (memory $0 256 256)
   (type $0 (func (param i32 i32)))
   (type $1 (func))
+  (memory $0 256 256)
   (func $b0-yes (type $0) (param $a i32) (param $b i32)
     (local $z i32)
     (local $y i32)
diff --git a/test/passes/simplify-locals.txt b/test/passes/simplify-locals.txt
index 359f46cb1..4fed54992 100644
--- a/test/passes/simplify-locals.txt
+++ b/test/passes/simplify-locals.txt
@@ -1,5 +1,4 @@
 (module
-  (memory $0 256 256)
   (type $FUNCSIG$v (func))
   (type $FUNCSIG$i (func (result i32)))
   (type $FUNCSIG$iiiii (func (param i32 i32 i32 i32) (result i32)))
@@ -15,6 +14,7 @@
   (import "env" "i64sub" (func $_i64Subtract (param i32 i32 i32 i32) (result i32)))
   (import "env" "moddi" (func $___udivmoddi4 (param i32 i32 i32 i32 i32) (result i32)))
   (import "env" "lp" (func $lp (param i32 i32) (result i32)))
+  (memory $0 256 256)
   (func $b0-yes (type $4) (param $i1 i32)
     (local $x i32)
     (local $y i32)
diff --git a/test/passes/vacuum.txt b/test/passes/vacuum.txt
index 0c2feeb09..e89321f74 100644
--- a/test/passes/vacuum.txt
+++ b/test/passes/vacuum.txt
@@ -1,5 +1,4 @@
 (module
-  (memory $0 256 256)
   (type $0 (func))
   (type $1 (func (param i32)))
   (type $2 (func (result f32)))
@@ -7,6 +6,7 @@
   (type $4 (func (param i32 f64 i32 i32)))
   (type $FUNCSIG$i (func (result i32)))
   (import "env" "int" (func $int (result i32)))
+  (memory $0 256 256)
   (global $Int i32 (i32.const 0))
   (func $b (type $0)
     (nop)