diff --git a/ml-proto/src/flags.ml b/ml-proto/src/flags.ml
index 69a11fdf82..2bb65d54f3 100644
--- a/ml-proto/src/flags.ml
+++ b/ml-proto/src/flags.ml
@@ -7,5 +7,5 @@ let version = "0.1"
 
 let interactive = ref false
 let trace = ref false
-let print_sig = ref true
+let print_sig = ref false
 let dry = ref false
diff --git a/ml-proto/test/expected-output/fac.wasm.log b/ml-proto/test/expected-output/fac.wasm.log
deleted file mode 100644
index 3e1d2b57b2..0000000000
--- a/ml-proto/test/expected-output/fac.wasm.log
+++ /dev/null
@@ -1,8 +0,0 @@
-export "fac-rec" : i64 -> i64
-export "fac-iter" : i64 -> i64
-export "fac-rec-named" : i64 -> i64
-export "fac-iter-named" : i64 -> i64
-7034535277573963776 : i64
-7034535277573963776 : i64
-7034535277573963776 : i64
-7034535277573963776 : i64
diff --git a/ml-proto/test/expected-output/memory.wasm.log b/ml-proto/test/expected-output/memory.wasm.log
index b0a5b44ee1..4706d157fa 100644
--- a/ml-proto/test/expected-output/memory.wasm.log
+++ b/ml-proto/test/expected-output/memory.wasm.log
@@ -1,8 +1 @@
-export "data" : () -> i32
-export "aligned" : () -> i32
-export "unaligned" : () -> i32
-export "cast" : () -> f64
-1 : i32
-1 : i32
-1 : i32
 -3.10552331246e+231 : f64
diff --git a/ml-proto/test/fac.wasm b/ml-proto/test/fac.wasm
index 11b38abff4..fd0113386b 100644
--- a/ml-proto/test/fac.wasm
+++ b/ml-proto/test/fac.wasm
@@ -67,7 +67,7 @@
   (export "fac-iter-named" $fac-iter)
 )
 
-(invoke "fac-rec" (const.i64 25))  ;; 7034535277573963776 : i64
-(invoke "fac-iter" (const.i64 25))  ;; 7034535277573963776 : i64
-(invoke "fac-rec-named" (const.i64 25))  ;; 7034535277573963776 : i64
-(invoke "fac-iter-named" (const.i64 25))  ;; 7034535277573963776 : i64
+(asserteq (invoke "fac-rec" (const.i64 25)) (const.i64 7034535277573963776))
+(asserteq (invoke "fac-iter" (const.i64 25)) (const.i64 7034535277573963776))
+(asserteq (invoke "fac-rec-named" (const.i64 25)) (const.i64 7034535277573963776))
+(asserteq (invoke "fac-iter-named" (const.i64 25)) (const.i64 7034535277573963776))
diff --git a/ml-proto/test/memory.wasm b/ml-proto/test/memory.wasm
index a2b112ae80..fb9a7f5262 100644
--- a/ml-proto/test/memory.wasm
+++ b/ml-proto/test/memory.wasm
@@ -80,7 +80,7 @@
   (export "cast" $cast)
 )
 
-(invoke "data")  ;; 1 : i32
-(invoke "aligned")  ;; 1 : i32
-(invoke "unaligned")  ;; 1 : i32
+(asserteq (invoke "data") (const.i32 1))
+(asserteq (invoke "aligned") (const.i32 1))
+(asserteq (invoke "unaligned") (const.i32 1))
 (invoke "cast")  ;; -3.10552331246e+231 : f64
diff --git a/ml-proto/test/multivalue.wasm b/ml-proto/test/multivalue.wasm
index 21aba46cea..ef6a81f40b 100644
--- a/ml-proto/test/multivalue.wasm
+++ b/ml-proto/test/multivalue.wasm
@@ -80,14 +80,14 @@
   (export "test" $test)
 )
 
-(invoke "test" (const.i32 1))  ;; (2 1) : (i32 i32)
-(invoke "test" (const.i32 2))  ;; (2 1) : (i32 i32)
-(invoke "test" (const.i32 3))  ;; (1 2) : (i32 i32)
-(invoke "test" (const.i32 4))  ;; (1 2) : (i32 i32)
-(invoke "test" (const.i32 5))  ;; (2 1) : (i32 i32)
-(invoke "test" (const.i32 6))  ;; (3 1) : (i32 i32)
-(invoke "test" (const.i32 7))  ;; (1 2) : (i32 i32)
-(invoke "test" (const.i32 8))  ;; (2 1) : (i32 i32)
-(invoke "test" (const.i32 9))  ;; (2 1) : (i32 i32)
-(invoke "test" (const.i32 10))  ;; (1 2) : (i32 i32)
-(invoke "test" (const.i32 11))  ;; (1 1) : (i32 i32)
+(asserteq (invoke "test" (const.i32 1)) (const.i32 2) (const.i32 1)) 
+(asserteq (invoke "test" (const.i32 2)) (const.i32 2) (const.i32 1))
+(asserteq (invoke "test" (const.i32 3)) (const.i32 1) (const.i32 2))
+(asserteq (invoke "test" (const.i32 4)) (const.i32 1) (const.i32 2))
+(asserteq (invoke "test" (const.i32 5)) (const.i32 2) (const.i32 1))
+(asserteq (invoke "test" (const.i32 6)) (const.i32 3) (const.i32 1))
+(asserteq (invoke "test" (const.i32 7)) (const.i32 1) (const.i32 2))
+(asserteq (invoke "test" (const.i32 8)) (const.i32 2) (const.i32 1))
+(asserteq (invoke "test" (const.i32 9)) (const.i32 2) (const.i32 1))
+(asserteq (invoke "test" (const.i32 10)) (const.i32 1) (const.i32 2))
+(asserteq (invoke "test" (const.i32 11)) (const.i32 1) (const.i32 1))
diff --git a/ml-proto/test/switch.wasm b/ml-proto/test/switch.wasm
index 419384575c..03627c7e02 100644
--- a/ml-proto/test/switch.wasm
+++ b/ml-proto/test/switch.wasm
@@ -42,20 +42,20 @@
   (export "expr" $expr)
 )
 
-(invoke "stmt" (const.i32 0))  ;; 0 : i32
-(invoke "stmt" (const.i32 1))  ;; -1 : i32
-(invoke "stmt" (const.i32 2))  ;; -2 : i32
-(invoke "stmt" (const.i32 3))  ;; -3 : i32
-(invoke "stmt" (const.i32 4))  ;; 100 : i32
-(invoke "stmt" (const.i32 5))  ;; 101 : i32
-(invoke "stmt" (const.i32 6))  ;; 102 : i32
-(invoke "stmt" (const.i32 7))  ;; 102 : i32
-(invoke "stmt" (const.i32 -10))  ;; 102 : i32
+(asserteq (invoke "stmt" (const.i32 0)) (const.i32 0))
+(asserteq (invoke "stmt" (const.i32 1)) (const.i32 -1))
+(asserteq (invoke "stmt" (const.i32 2)) (const.i32 -2))
+(asserteq (invoke "stmt" (const.i32 3)) (const.i32 -3))
+(asserteq (invoke "stmt" (const.i32 4)) (const.i32 100))
+(asserteq (invoke "stmt" (const.i32 5)) (const.i32 101))
+(asserteq (invoke "stmt" (const.i32 6)) (const.i32 102))
+(asserteq (invoke "stmt" (const.i32 7)) (const.i32 102))
+(asserteq (invoke "stmt" (const.i32 -10)) (const.i32 102))
 
-(invoke "expr" (const.i64 0))  ;; 0 : i64
-(invoke "expr" (const.i64 1))  ;; -1 : i64
-(invoke "expr" (const.i64 2))  ;; -2 : i64
-(invoke "expr" (const.i64 3))  ;; -3 : i64
-(invoke "expr" (const.i64 6))  ;; 101 : i64
-(invoke "expr" (const.i64 7))  ;; 100 : i64
-(invoke "expr" (const.i64 -10))  ;; 100 : i64
+(asserteq (invoke "expr" (const.i64 0)) (const.i64 0))
+(asserteq (invoke "expr" (const.i64 1)) (const.i64 -1))
+(asserteq (invoke "expr" (const.i64 2)) (const.i64 -2))
+(asserteq (invoke "expr" (const.i64 3)) (const.i64 -3))
+(asserteq (invoke "expr" (const.i64 6)) (const.i64 101))
+(asserteq (invoke "expr" (const.i64 7)) (const.i64 100))
+(asserteq (invoke "expr" (const.i64 -10)) (const.i64 100))