diff --git a/default.nix b/default.nix
index af2d765..2b2fd5e 100644
--- a/default.nix
+++ b/default.nix
@@ -17,11 +17,18 @@
 
 let
 
+spec-tests-mvp = pkgs.fetchFromGitHub {
+     owner  = "WebAssembly";
+     repo   = "testsuite";
+     rev    = "35c50bf6fbb002cfdc1227b0af731bdcaf877714";
+     sha256 = "0difcpya5i7fc4xdrysx49186x9vh5yhm88dqpmfppj7ddj39l9i";
+  };
+
 spec-tests = pkgs.fetchFromGitHub {
     owner  = "WebAssembly";
     repo   = "testsuite";
-    rev    = "35c50bf6fbb002cfdc1227b0af731bdcaf877714";
-    sha256 = "0difcpya5i7fc4xdrysx49186x9vh5yhm88dqpmfppj7ddj39l9i";
+    rev    = "6aacfd8929504d8e02a5144a14d184196ede6790";
+    sha256 = "sha256-HrnTpIEVN3H9P4fuSBUkaMpNdMxa2pbfp1iPElJLlUM";
   };
 
 drv = pkgs.haskellPackages.developPackage {
@@ -47,4 +54,7 @@ drv = pkgs.haskellPackages.developPackage {
   inherit returnShellEnv;
 };
 
-in drv.overrideAttrs(old: { WASM_SPEC_TESTS = "${spec-tests}"; })
+in drv.overrideAttrs(old:
+  { WASM_SPEC_TESTS_MVP = spec-tests-mvp;
+    WASM_SPEC_TESTS = spec-tests;
+  })
diff --git a/src/Wasm/Binary/Decode.hs b/src/Wasm/Binary/Decode.hs
index 8fc8645..f05bdd8 100644
--- a/src/Wasm/Binary/Decode.hs
+++ b/src/Wasm/Binary/Decode.hs
@@ -258,6 +258,10 @@ getMathPrefix = do
     0x05 -> return $ Convert $ I64ConvertOp Int.TruncUSatF32
     0x06 -> return $ Convert $ I64ConvertOp Int.TruncSSatF64
     0x07 -> return $ Convert $ I64ConvertOp Int.TruncUSatF64
+    0x0A -> do (0, 0) <- (,) <$> getWord8 <*> getWord8
+               return MemoryCopy
+    0x0B -> do 0 <- getWord8
+               return MemoryFill
     _    -> fail (printf "getMathPrefix: illegal op %d" byte)
 
 
diff --git a/src/Wasm/Binary/Encode.hs b/src/Wasm/Binary/Encode.hs
index b0d348f..c702452 100644
--- a/src/Wasm/Binary/Encode.hs
+++ b/src/Wasm/Binary/Encode.hs
@@ -384,6 +384,10 @@ putInstr = flip (.) unFix $ \case
   MemoryGrow -> do
     putWord8 0x40
     putWord8 0x00
+  MemoryFill -> do
+    mapM_ putWord8 [0xFC, 0x0B, 0x00]
+  MemoryCopy -> do
+    mapM_ putWord8 [0xFC, 0x0A, 0x00, 0x00]
 
   -- Constants.
   Const (value -> I32 val) -> do
diff --git a/src/Wasm/Exec/Eval.hs b/src/Wasm/Exec/Eval.hs
index d409b7d..ee62896 100644
--- a/src/Wasm/Exec/Eval.hs
+++ b/src/Wasm/Exec/Eval.hs
@@ -479,6 +479,48 @@ step(Code cs cfg vs (e:es)) = (`runReaderT` cfg) $ do
                   Right () -> oldSize
           k (I32 result : vs') es
 
+        (MemoryFill, I32 0 : _ : I32 dst : vs') -> {-# SCC step_MemoryFill #-} do
+          inst    <- getFrameInst
+          mem     <- lift $ memory inst (0 @@ at)
+          -- Zero len with offset out-of-bounds at the end of memory is allowed
+          sz      <- lift $ lift $ Memory.size mem
+          if Memory.pageSize * sz >= dst
+            then k vs' es
+            else k vs' (Trapping (memoryErrorString Memory.MemoryBoundsError) @@ at : es)
+
+        (MemoryFill, I32 cnt : v : I32 dst : vs') -> {-# SCC step_MemoryFill #-} do
+          inst    <- getFrameInst
+          mem     <- lift $ memory inst (0 @@ at)
+          let [addr, count] = fromIntegral . i64_extend_u_i32 . fromIntegral <$> [dst, cnt]
+          if addr + count > 2^32
+            then k vs' (Trapping (memoryErrorString Memory.MemoryBoundsError) @@ at : es)
+            else do
+              eres <- lift $ lift $ runExceptT $ mapM_ (\off -> Memory.storePacked Pack8 mem addr off v) [0 .. pred cnt]
+              case eres of
+                Right () -> k vs' es
+                Left exn -> k vs' (Trapping (memoryErrorString exn) @@ at : es)
+
+        (MemoryCopy, I32 0 : I32 src : I32 dst : vs') -> {-# SCC step_MemoryCopy #-} do
+          inst    <- getFrameInst
+          mem     <- lift $ memory inst (0 @@ at)
+          -- Zero len with src/dest offset out-of-bounds at the end of memory is allowed
+          sz      <- lift $ lift $ Memory.size mem
+          if Memory.pageSize * sz >= dst && Memory.pageSize * sz >= src
+            then k vs' es
+            else k vs' (Trapping (memoryErrorString Memory.MemoryBoundsError) @@ at : es)
+
+        (MemoryCopy, I32 cnt : I32 src : I32 dst : vs') -> {-# SCC step_MemoryCopy #-} do
+          inst    <- getFrameInst
+          mem     <- lift $ memory inst (0 @@ at)
+          let [addr_dst, addr_src, count] = fromIntegral . i64_extend_u_i32 . fromIntegral <$> [dst, src, cnt]
+          let range = if dst < src then [0 .. pred cnt] else tail $ enumFromThenTo cnt (pred cnt) 0
+          eres <- lift $ lift $ runExceptT $
+            mapM_ (\addr -> Memory.loadPacked Pack8 ZX mem (addr + pred count) 0 I32Type) [addr_dst, addr_src]
+            >> mapM_ (\off -> Memory.loadPacked Pack8 ZX mem addr_src off I32Type >>= Memory.storePacked Pack8 mem addr_dst off) range
+          case eres of
+            Right () -> k vs' es
+            Left exn -> k vs' (Trapping (memoryErrorString exn) @@ at : es)
+
         (Const v, vs) -> {-# SCC step_Const #-}
           k (value v : vs) es
 
diff --git a/src/Wasm/Runtime/Memory.hs b/src/Wasm/Runtime/Memory.hs
index f6b62ba..9043cc0 100644
--- a/src/Wasm/Runtime/Memory.hs
+++ b/src/Wasm/Runtime/Memory.hs
@@ -24,6 +24,7 @@ module Wasm.Runtime.Memory
   , loadValue
   , exportMemory
   , importMemory
+  , pageSize
   ) where
 
 import           Control.Exception
diff --git a/src/Wasm/Syntax/AST.hs b/src/Wasm/Syntax/AST.hs
index 19a9bad..9ca5bf9 100644
--- a/src/Wasm/Syntax/AST.hs
+++ b/src/Wasm/Syntax/AST.hs
@@ -94,6 +94,8 @@ data InstrF (phrase :: * -> *) fix
   | Store StoreOp
   | MemorySize
   | MemoryGrow
+  | MemoryFill
+  | MemoryCopy
   | Const (Literal phrase)
   | Test TestOp
   | Compare CompareOp
@@ -135,6 +137,8 @@ instance (NFData1 phrase) => NFData1 (InstrF phrase) where
     Store op -> rnf op
     MemorySize -> ()
     MemoryGrow -> ()
+    MemoryFill -> ()
+    MemoryCopy -> ()
     Const lit -> rnfLift lit
     Test op -> rnf op
     Compare op -> rnf op
@@ -219,6 +223,10 @@ instance (Show1 phrase) => Show1 (InstrF phrase) where
       showString "MemorySize"
     MemoryGrow ->
       showString "MemoryGrow"
+    MemoryFill ->
+      showString "MemoryFill"
+    MemoryCopy ->
+      showString "MemoryCopy"
     Const lit ->
       showString "Const " .
       showLiftPrec 11 lit
@@ -320,12 +328,14 @@ showWasm d ((value -> Fix instr):instrs) = go instr . showString "\n" . showWasm
     Store (MemoryOp I64Type x y (Just Pack8))       -> showString "i64.store8 " . showsPrec d x . showString " " . showsPrec d y
     Store (MemoryOp I64Type x y (Just Pack16))      -> showString "i64.store16 " . showsPrec d x . showString " " . showsPrec d y
     Store (MemoryOp I64Type x y (Just Pack32))      -> showString "i64.store32 " . showsPrec d x . showString " " . showsPrec d y
-    MemorySize                                      -> showString "memory_size"
-    MemoryGrow                                      -> showString "memory_grow"
-    Const (value -> I32 x)                           -> showString "i32.const " . showsPrec d x
-    Const (value -> I64 x)                           -> showString "i64.const " . showsPrec d x
-    Const (value -> F32 x)                           -> showString "f32.const " . showsPrec d x
-    Const (value -> F64 x)                           -> showString "f64.const " . showsPrec d x
+    MemorySize                                      -> showString "memory.size"
+    MemoryGrow                                      -> showString "memory.grow"
+    MemoryFill                                      -> showString "memory.fill"
+    MemoryCopy                                      -> showString "memory.copy"
+    Const (value -> I32 x)                          -> showString "i32.const " . showsPrec d x
+    Const (value -> I64 x)                          -> showString "i64.const " . showsPrec d x
+    Const (value -> F32 x)                          -> showString "f32.const " . showsPrec d x
+    Const (value -> F64 x)                          -> showString "f64.const " . showsPrec d x
     Unary (I32UnaryOp Clz)                          -> showString "i32.clz"
     Unary (I32UnaryOp Ctz)                          -> showString "i32.ctz"
     Unary (I32UnaryOp Popcnt)                       -> showString "i32.popcnt"
diff --git a/src/Wasm/Syntax/DSL.hs b/src/Wasm/Syntax/DSL.hs
index cd2b90e..6819122 100644
--- a/src/Wasm/Syntax/DSL.hs
+++ b/src/Wasm/Syntax/DSL.hs
@@ -78,6 +78,8 @@ class Monad (WasmM t) => Wasm t where
   -- Memory operators.
   memory_size :: WasmM t ()
   memory_grow :: WasmM t ()
+  memory_fill :: WasmM t ()
+  memory_copy :: WasmM t ()
 
   -- Constants.
   i32_const :: Int32 -> WasmM t ()
@@ -306,6 +308,8 @@ instance Applicative f => Wasm [Instr f] where
   -- Memory operators.
   memory_size = WasmM $ tell [Fix $ MemorySize]
   memory_grow = WasmM $ tell [Fix $ MemoryGrow]
+  memory_fill = WasmM $ tell [Fix $ MemoryFill]
+  memory_copy = WasmM $ tell [Fix $ MemoryCopy]
 
   -- Constants.
   i32_const x = WasmM $ tell [Fix $ Const (pure (I32 x))]
diff --git a/test/Main.hs b/test/Main.hs
index 2aa1a6e..d4e2233 100644
--- a/test/Main.hs
+++ b/test/Main.hs
@@ -11,23 +11,69 @@ import Spec as Spec (tests)
 
 main :: IO ()
 main = do
+  mwasmPathMVP <- lookupEnv "WASM_SPEC_TESTS_MVP"
+  testDirMVP <- case mwasmPathMVP of
+      Nothing -> error "Please define WASM_SPEC_TESTS_MVP to point to .../WebAssembly/spec/test/core"
+      Just path -> pure path
   mwasmPath <- lookupEnv "WASM_SPEC_TESTS"
   testDir <- case mwasmPath of
-      Nothing -> error "Please define WASM_SPEC_TESTS to point to .../WebAssebly/spec/test/core"
-      Just path -> return path
+      Nothing -> error "Please define WASM_SPEC_TESTS to point to .../WebAssembly/spec/test/core"
+      Just path -> pure path
+  putStrLn $ "Using wasm MVP spec test directory: " ++ testDirMVP
   putStrLn $ "Using wasm spec test directory: " ++ testDir
+
+  filesMVP <- listDirectory testDirMVP
+  let wastFilesMVP = flip concatMap filesMVP $ \file ->
+        [ testDirMVP ++ "/" ++ file
+        | ".wast" `isSuffixOf` file
+          && file `notElem`
+          [ "inline-module.wast"
+            -- We aren't going to bother fully supporting
+            -- Unicode function names in the reference interpreter yet.
+          , "names.wast"
+          ]
+        ]
+
   files <- listDirectory testDir
   let wastFiles = flip concatMap files $ \file ->
         [ testDir ++ "/" ++ file
         | ".wast" `isSuffixOf` file
-            && "inline-module.wast" /= file
-              -- We aren't going to bother fully supporting
-              -- Unicode function names in the reference interpreter yet.
-            && "names.wast" /= file
+          && file `notElem`
+          [ "inline-module.wast"
+            -- We aren't going to bother fully supporting
+            -- Unicode function names in the reference interpreter yet.
+          , "names.wast"
+            -- These contain features that `winter` won't accept yet
+          , "bulk.wast"
+          , "memory_init.wast"
+          , "ref_null.wast"
+          , "table_get.wast"
+          , "table_grow.wast"
+          , "table.wast"
+          , "ref_is_null.wast"
+          , "ref_func.wast"
+          , "unreached-valid.wast"
+          , "exports.wast"
+          , "imports.wast"
+          , "br_table.wast"
+          , "table_size.wast"
+          , "table_fill.wast"
+          , "table_init.wast"
+          , "table_set.wast"
+          , "table_copy.wast"
+          , "global.wast"
+          , "linking.wast"
+          , "binary-leb128.wast"
+          , "elem.wast"
+          , "call_indirect.wast"
+          , "binary.wast"
+          , "select.wast"
+          ]
         ]
 
   defaultMain $ testGroup "main"
     [ Property.tests
     , Unit.tests
-    , Spec.tests wastFiles
+    , Spec.tests [] "spec MVP" wastFilesMVP
+    , Spec.tests ["--enable-bulk-memory"] "spec" wastFiles
     ]
diff --git a/test/Spec.hs b/test/Spec.hs
index e604134..b64fb80 100644
--- a/test/Spec.hs
+++ b/test/Spec.hs
@@ -17,8 +17,8 @@ import           Wasm.Util.Float (floatToBits, doubleToBits)
 import           SpecTest (spectest)
 import           Wat2Wasm (wat2Wasm)
 
-tests :: [FilePath] -> TestTree
-tests files = testGroup "spec" $ map prep files
+tests :: [String] -> String -> [FilePath] -> TestTree
+tests languageFlags name files = testGroup name $ map prep files
  where
   prep file = testCaseSteps file $ \step -> do
     input <- Prelude.readFile file
@@ -26,7 +26,7 @@ tests files = testGroup "spec" $ map prep files
     parseWastFile @(Winter Phrase) @IO file input
       (M.singleton "spectest" 1)
       (IM.singleton 1 inst)
-      wat2Wasm step valListEq assertFailure
+      (wat2Wasm languageFlags) step valListEq assertFailure
 
 valListEq :: [Value] -> [Value] -> Bool
 valListEq vs1 vs2 =
diff --git a/test/Wat2Wasm.hs b/test/Wat2Wasm.hs
index 51267cf..25aea0c 100644
--- a/test/Wat2Wasm.hs
+++ b/test/Wat2Wasm.hs
@@ -7,18 +7,18 @@ import           System.Exit
 import           System.IO.Temp
 import           System.Process
 
-wat2Wasm :: String -> IO ByteString
-wat2Wasm contents = do
+wat2Wasm :: [String] -> String -> IO ByteString
+wat2Wasm languageFlags contents = do
   wat  <- emptyTempFile "." "test.wat"
   wasm <- emptyTempFile "." "test.wasm"
   writeFile wat contents
   (exit, _out, err) <-
-    readProcessWithExitCode "wat2wasm" [wat, "-o", wasm] ""
+    readProcessWithExitCode "wat2wasm" (wat : languageFlags <> ["-o", wasm]) ""
   case exit of
-    ExitSuccess   -> do
+    ExitSuccess -> do
       res <- BL.readFile wasm
       removeFile wat
       removeFile wasm
-      return res
+      pure res
     ExitFailure _ ->
       fail err
diff --git a/test/wasm/binary-module.wasm b/test/wasm/binary-module.wasm
deleted file mode 100644
index 1809dde..0000000
Binary files a/test/wasm/binary-module.wasm and /dev/null differ
diff --git a/test/wasm/data-offset.wasm b/test/wasm/data-offset.wasm
deleted file mode 100644
index 0fb56ac..0000000
Binary files a/test/wasm/data-offset.wasm and /dev/null differ
diff --git a/test/wasm/elem-offset.wasm b/test/wasm/elem-offset.wasm
deleted file mode 100644
index 58e3163..0000000
Binary files a/test/wasm/elem-offset.wasm and /dev/null differ
diff --git a/test/wasm/export-func-multi.wasm b/test/wasm/export-func-multi.wasm
deleted file mode 100644
index 0110630..0000000
Binary files a/test/wasm/export-func-multi.wasm and /dev/null differ
diff --git a/test/wasm/export-func-named.wasm b/test/wasm/export-func-named.wasm
deleted file mode 100644
index bc9ecf5..0000000
Binary files a/test/wasm/export-func-named.wasm and /dev/null differ
diff --git a/test/wasm/export-func.wasm b/test/wasm/export-func.wasm
deleted file mode 100644
index 643646c..0000000
Binary files a/test/wasm/export-func.wasm and /dev/null differ
diff --git a/test/wasm/export-global.wasm b/test/wasm/export-global.wasm
deleted file mode 100644
index 6e18fd5..0000000
Binary files a/test/wasm/export-global.wasm and /dev/null differ
diff --git a/test/wasm/export-memory-multi.wasm b/test/wasm/export-memory-multi.wasm
deleted file mode 100644
index 9bb0920..0000000
Binary files a/test/wasm/export-memory-multi.wasm and /dev/null differ
diff --git a/test/wasm/export-memory.wasm b/test/wasm/export-memory.wasm
deleted file mode 100644
index 8c10f92..0000000
Binary files a/test/wasm/export-memory.wasm and /dev/null differ
diff --git a/test/wasm/export-table.wasm b/test/wasm/export-table.wasm
deleted file mode 100644
index b6bbf94..0000000
Binary files a/test/wasm/export-table.wasm and /dev/null differ
diff --git a/test/wasm/global.wasm b/test/wasm/global.wasm
deleted file mode 100644
index 06aeeb2..0000000
Binary files a/test/wasm/global.wasm and /dev/null differ
diff --git a/test/wasm/import-func-no-param.wasm b/test/wasm/import-func-no-param.wasm
deleted file mode 100644
index 3040a50..0000000
Binary files a/test/wasm/import-func-no-param.wasm and /dev/null differ
diff --git a/test/wasm/import-func-type.wasm b/test/wasm/import-func-type.wasm
deleted file mode 100644
index 34c4747..0000000
Binary files a/test/wasm/import-func-type.wasm and /dev/null differ
diff --git a/test/wasm/import-func.wasm b/test/wasm/import-func.wasm
deleted file mode 100644
index 261c138..0000000
Binary files a/test/wasm/import-func.wasm and /dev/null differ
diff --git a/test/wasm/import-global-getglobal.wasm b/test/wasm/import-global-getglobal.wasm
deleted file mode 100644
index bf5e80f..0000000
Binary files a/test/wasm/import-global-getglobal.wasm and /dev/null differ
diff --git a/test/wasm/import-global.wasm b/test/wasm/import-global.wasm
deleted file mode 100644
index ec9e890..0000000
Binary files a/test/wasm/import-global.wasm and /dev/null differ
diff --git a/test/wasm/import-memory.wasm b/test/wasm/import-memory.wasm
deleted file mode 100644
index aada085..0000000
Binary files a/test/wasm/import-memory.wasm and /dev/null differ
diff --git a/test/wasm/import-table.wasm b/test/wasm/import-table.wasm
deleted file mode 100644
index 4a27061..0000000
Binary files a/test/wasm/import-table.wasm and /dev/null differ
diff --git a/test/wasm/memory-init-max-size.wasm b/test/wasm/memory-init-max-size.wasm
deleted file mode 100644
index c215007..0000000
Binary files a/test/wasm/memory-init-max-size.wasm and /dev/null differ
diff --git a/test/wasm/memory-init-size.wasm b/test/wasm/memory-init-size.wasm
deleted file mode 100644
index 67d6849..0000000
Binary files a/test/wasm/memory-init-size.wasm and /dev/null differ
diff --git a/test/wasm/memory-segment-1.wasm b/test/wasm/memory-segment-1.wasm
deleted file mode 100644
index 9970063..0000000
Binary files a/test/wasm/memory-segment-1.wasm and /dev/null differ
diff --git a/test/wasm/memory-segment-long.wasm b/test/wasm/memory-segment-long.wasm
deleted file mode 100644
index a460b3a..0000000
Binary files a/test/wasm/memory-segment-long.wasm and /dev/null differ
diff --git a/test/wasm/memory-segment-many.wasm b/test/wasm/memory-segment-many.wasm
deleted file mode 100644
index 015b8d4..0000000
Binary files a/test/wasm/memory-segment-many.wasm and /dev/null differ
diff --git a/test/wasm/memory-segment-multi-string.wasm b/test/wasm/memory-segment-multi-string.wasm
deleted file mode 100644
index 23d3896..0000000
Binary files a/test/wasm/memory-segment-multi-string.wasm and /dev/null differ
diff --git a/test/wasm/module-empty.wasm b/test/wasm/module-empty.wasm
deleted file mode 100644
index d8fc92d..0000000
Binary files a/test/wasm/module-empty.wasm and /dev/null differ
diff --git a/test/wasm/module-name.wasm b/test/wasm/module-name.wasm
deleted file mode 100644
index 63adb65..0000000
Binary files a/test/wasm/module-name.wasm and /dev/null differ
diff --git a/test/wasm/start-named.wasm b/test/wasm/start-named.wasm
deleted file mode 100644
index 0e1132c..0000000
Binary files a/test/wasm/start-named.wasm and /dev/null differ
diff --git a/test/wasm/start.wasm b/test/wasm/start.wasm
deleted file mode 100644
index 0e1132c..0000000
Binary files a/test/wasm/start.wasm and /dev/null differ
diff --git a/test/wasm/table-named.wasm b/test/wasm/table-named.wasm
deleted file mode 100644
index 554d248..0000000
Binary files a/test/wasm/table-named.wasm and /dev/null differ
diff --git a/test/wasm/table.wasm b/test/wasm/table.wasm
deleted file mode 100644
index 554d248..0000000
Binary files a/test/wasm/table.wasm and /dev/null differ
diff --git a/test/wasm/type-empty-param.wasm b/test/wasm/type-empty-param.wasm
deleted file mode 100644
index 044cf4c..0000000
Binary files a/test/wasm/type-empty-param.wasm and /dev/null differ
diff --git a/test/wasm/type-empty.wasm b/test/wasm/type-empty.wasm
deleted file mode 100644
index 044cf4c..0000000
Binary files a/test/wasm/type-empty.wasm and /dev/null differ
diff --git a/test/wasm/type-multi-param.wasm b/test/wasm/type-multi-param.wasm
deleted file mode 100644
index d042a90..0000000
Binary files a/test/wasm/type-multi-param.wasm and /dev/null differ
diff --git a/test/wasm/type-no-param.wasm b/test/wasm/type-no-param.wasm
deleted file mode 100644
index 5fce444..0000000
Binary files a/test/wasm/type-no-param.wasm and /dev/null differ
diff --git a/test/wasm/type.wasm b/test/wasm/type.wasm
deleted file mode 100644
index f6e1cb2..0000000
Binary files a/test/wasm/type.wasm and /dev/null differ
diff --git a/test/wast/binary-module.wast b/test/wast/binary-module.wast
deleted file mode 100644
index e0df856..0000000
--- a/test/wast/binary-module.wast
+++ /dev/null
@@ -1,17 +0,0 @@
-(module binary
-  "\00asm"            ;; magic
-  "\01\00\00\00"      ;; version
-  "\01\05"            ;; type section, 5 bytes
-  "\01\60\00\01\7f"   ;; 1 type, function, no params, i32 result
-  "\03\02"            ;; function section, 2 bytes
-  "\01\00"            ;; 1 function, type 0
-  "\07\08"            ;; export section, 8 bytes
-  "\01\04main\00\00"  ;; 1 export, function 0, named "main"
-  "\0a\08"            ;; code section, 8 bytes
-  "\01\06"            ;; 1 function, 6 bytes
-  "\00"               ;; 0 locals
-  "\41"               ;; i32.const
-  "\dc\7c"            ;; -420
-  "\0f"               ;; return
-  "\0b"               ;; end (of function)
-)
diff --git a/test/wast/data-offset.wast b/test/wast/data-offset.wast
deleted file mode 100644
index dfa6dad..0000000
--- a/test/wast/data-offset.wast
+++ /dev/null
@@ -1,5 +0,0 @@
-(module
-  (import "foo" "bar" (global i32))
-  (memory 1)
-  (global i32 i32.const 1)
-  (data (get_global 0) "hi"))
diff --git a/test/wast/elem-offset.wast b/test/wast/elem-offset.wast
deleted file mode 100644
index 44721f8..0000000
--- a/test/wast/elem-offset.wast
+++ /dev/null
@@ -1,6 +0,0 @@
-(module
-  (import "foo" "bar" (global i32))
-  (global i32 i32.const 1)
-  (func)
-  (table 2 anyfunc)
-  (elem (get_global 0) 0))
diff --git a/test/wast/export-func-multi.wast b/test/wast/export-func-multi.wast
deleted file mode 100644
index 30d2231..0000000
--- a/test/wast/export-func-multi.wast
+++ /dev/null
@@ -1,4 +0,0 @@
-(module
-  (func (nop))
-  (export "a" (func 0))
-  (export "b" (func 0)))
diff --git a/test/wast/export-func-named.wast b/test/wast/export-func-named.wast
deleted file mode 100644
index 8ebe599..0000000
--- a/test/wast/export-func-named.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (func $n (result i32) (i32.const 0))
-  (export "n" (func $n)))
diff --git a/test/wast/export-func.wast b/test/wast/export-func.wast
deleted file mode 100644
index 1892a22..0000000
--- a/test/wast/export-func.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (func (nop))
-  (export "nop" (func 0)))
diff --git a/test/wast/export-global.wast b/test/wast/export-global.wast
deleted file mode 100644
index bdffc6b..0000000
--- a/test/wast/export-global.wast
+++ /dev/null
@@ -1,4 +0,0 @@
-(module
-  (global i32 (i32.const 0))
-  (global (mut f32) (f32.const 0))
-  (export "global0" (global 0)))
diff --git a/test/wast/export-memory-multi.wast b/test/wast/export-memory-multi.wast
deleted file mode 100644
index d00acc5..0000000
--- a/test/wast/export-memory-multi.wast
+++ /dev/null
@@ -1,4 +0,0 @@
-(module
-  (memory 1)
-  (export "mem1" (memory 0))
-  (export "mem2" (memory 0)))
diff --git a/test/wast/export-memory.wast b/test/wast/export-memory.wast
deleted file mode 100644
index eec9809..0000000
--- a/test/wast/export-memory.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (memory 1)
-  (export "mem" (memory 0)))
diff --git a/test/wast/export-table.wast b/test/wast/export-table.wast
deleted file mode 100644
index 12c926f..0000000
--- a/test/wast/export-table.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (table 0 anyfunc)
-  (export "my_table" (table 0)))
diff --git a/test/wast/global.wast b/test/wast/global.wast
deleted file mode 100644
index 5a94ca9..0000000
--- a/test/wast/global.wast
+++ /dev/null
@@ -1,15 +0,0 @@
-(module
-  (import "foo" "i32_global" (global i32))
-  (import "foo" "i64_global" (global i64))
-  (import "foo" "f32_global" (global f32))
-  (import "foo" "f64_global" (global f64))
-
-  (global i32 (i32.const 1))
-  (global i64 (i64.const 2))
-  (global f32 (f32.const 3))
-  (global f64 (f64.const 4))
-
-  (global i32 (get_global 0))
-  (global i64 (get_global 1))
-  (global f32 (get_global 2))
-  (global f64 (get_global 3)))
diff --git a/test/wast/import-func-no-param.wast b/test/wast/import-func-no-param.wast
deleted file mode 100644
index 9302e92..0000000
--- a/test/wast/import-func-no-param.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (import "foo" "bar" (func)))
diff --git a/test/wast/import-func-type.wast b/test/wast/import-func-type.wast
deleted file mode 100644
index 9f31b90..0000000
--- a/test/wast/import-func-type.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (type (func (param i32 i64 f32 f64) (result i32)))
-  (import "foo" "bar" (func (type 0))))
diff --git a/test/wast/import-func.wast b/test/wast/import-func.wast
deleted file mode 100644
index a999e01..0000000
--- a/test/wast/import-func.wast
+++ /dev/null
@@ -1,10 +0,0 @@
-(module
-  ;; unnamed
-  (import "foo" "bar" (func (param i32) (result i64)))
-
-  ;; named
-  (import "stdio" "print" (func $print_i32 (param i32)))
-  (import "math" "add" (func $add_i32 (param i32 i32) (result i32)))
-  (import "test" "f32" (func $f32 (param f32) (result f32)))
-  (import "test" "f64" (func $f64 (param f64) (result f64)))
-  (import "test" "i64" (func $i64 (param i64) (result i64))))
diff --git a/test/wast/import-global-getglobal.wast b/test/wast/import-global-getglobal.wast
deleted file mode 100644
index fb6a5fb..0000000
--- a/test/wast/import-global-getglobal.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (import "a" "global" (global i32))
-  (global i32 (get_global 0)))
diff --git a/test/wast/import-global.wast b/test/wast/import-global.wast
deleted file mode 100644
index 216ae32..0000000
--- a/test/wast/import-global.wast
+++ /dev/null
@@ -1,5 +0,0 @@
-(module
-  (import "foo" "1" (global i32))
-  (import "foo" "2" (global i64))
-  (import "foo" "3" (global f32))
-  (import "foo" "4" (global f64)))
diff --git a/test/wast/import-memory.wast b/test/wast/import-memory.wast
deleted file mode 100644
index 8d22fd6..0000000
--- a/test/wast/import-memory.wast
+++ /dev/null
@@ -1,2 +0,0 @@
-(module
-  (import "foo" "2" (memory 0 2)))
diff --git a/test/wast/import-table.wast b/test/wast/import-table.wast
deleted file mode 100644
index 90b2603..0000000
--- a/test/wast/import-table.wast
+++ /dev/null
@@ -1,2 +0,0 @@
-(module
-  (import "foo" "2" (table 0 10 anyfunc)))
diff --git a/test/wast/memory-init-max-size.wast b/test/wast/memory-init-max-size.wast
deleted file mode 100644
index ee01c49..0000000
--- a/test/wast/memory-init-max-size.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (memory 1 2))
diff --git a/test/wast/memory-init-size.wast b/test/wast/memory-init-size.wast
deleted file mode 100644
index 4503196..0000000
--- a/test/wast/memory-init-size.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (memory 1))
diff --git a/test/wast/memory-segment-1.wast b/test/wast/memory-segment-1.wast
deleted file mode 100644
index 69bc049..0000000
--- a/test/wast/memory-segment-1.wast
+++ /dev/null
@@ -1,2 +0,0 @@
-(module
-  (memory (data "hello, world!")))
diff --git a/test/wast/memory-segment-long.wast b/test/wast/memory-segment-long.wast
deleted file mode 100644
index a0836fd..0000000
--- a/test/wast/memory-segment-long.wast
+++ /dev/null
@@ -1,13 +0,0 @@
-;; This is a regression test to ensure we read and parse integer tokens ASAP.
-;; Otherwise the memory that is used to store them may be reused. In this case,
-;; the very long data segment strings were causing the strings that store the
-;; initial size and max size to be clobbered.
-(module
-  (memory 1 65535)
-  (data (i32.const 8) "\10\01\00\00")
-  (data (i32.const 16) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\03 \02 \02 \02 \02 \02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\02\00\01`\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\08\d8\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\08\d5\08\d5\08\d5\08\d5\08\d5\08\d5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\08\c5\04\c0\04\c0\04\c0\04\c0\04\c0\04\c0\08\d6\08\d6\08\d6\08\d6\08\d6\08\d6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\08\c6\04\c0\04\c0\04\c0\04\c0\02\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
-  (data (i32.const 784) " \05\00\00")
-  (data (i32.const 800) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00\07\00\00\00\08\00\00\00\t\00\00\00\n\00\00\00\0b\00\00\00\0c\00\00\00\0d\00\00\00\0e\00\00\00\0f\00\00\00\10\00\00\00\11\00\00\00\12\00\00\00\13\00\00\00\14\00\00\00\15\00\00\00\16\00\00\00\17\00\00\00\18\00\00\00\19\00\00\00\1a\00\00\00\1b\00\00\00\1c\00\00\00\1d\00\00\00\1e\00\00\00\1f\00\00\00 \00\00\00!\00\00\00\"\00\00\00#\00\00\00$\00\00\00%\00\00\00&\00\00\00\'\00\00\00(\00\00\00)\00\00\00*\00\00\00+\00\00\00,\00\00\00-\00\00\00.\00\00\00/\00\00\000\00\00\001\00\00\002\00\00\003\00\00\004\00\00\005\00\00\006\00\00\007\00\00\008\00\00\009\00\00\00:\00\00\00;\00\00\00<\00\00\00=\00\00\00>\00\00\00?\00\00\00@\00\00\00a\00\00\00b\00\00\00c\00\00\00d\00\00\00e\00\00\00f\00\00\00g\00\00\00h\00\00\00i\00\00\00j\00\00\00k\00\00\00l\00\00\00m\00\00\00n\00\00\00o\00\00\00p\00\00\00q\00\00\00r\00\00\00s\00\00\00t\00\00\00u\00\00\00v\00\00\00w\00\00\00x\00\00\00y\00\00\00z\00\00\00[\00\00\00\\\00\00\00]\00\00\00^\00\00\00_\00\00\00`\00\00\00a\00\00\00b\00\00\00c\00\00\00d\00\00\00e\00\00\00f\00\00\00g\00\00\00h\00\00\00i\00\00\00j\00\00\00k\00\00\00l\00\00\00m\00\00\00n\00\00\00o\00\00\00p\00\00\00q\00\00\00r\00\00\00s\00\00\00t\00\00\00u\00\00\00v\00\00\00w\00\00\00x\00\00\00y\00\00\00z\00\00\00{\00\00\00|\00\00\00}\00\00\00~\00\00\00\7f\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
-  (data (i32.const 2336) "0\0b\00\00")
-  (data (i32.const 2352) "\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\01\00\00\00\02\00\00\00\03\00\00\00\04\00\00\00\05\00\00\00\06\00\00\00\07\00\00\00\08\00\00\00\t\00\00\00\n\00\00\00\0b\00\00\00\0c\00\00\00\0d\00\00\00\0e\00\00\00\0f\00\00\00\10\00\00\00\11\00\00\00\12\00\00\00\13\00\00\00\14\00\00\00\15\00\00\00\16\00\00\00\17\00\00\00\18\00\00\00\19\00\00\00\1a\00\00\00\1b\00\00\00\1c\00\00\00\1d\00\00\00\1e\00\00\00\1f\00\00\00 \00\00\00!\00\00\00\"\00\00\00#\00\00\00$\00\00\00%\00\00\00&\00\00\00\'\00\00\00(\00\00\00)\00\00\00*\00\00\00+\00\00\00,\00\00\00-\00\00\00.\00\00\00/\00\00\000\00\00\001\00\00\002\00\00\003\00\00\004\00\00\005\00\00\006\00\00\007\00\00\008\00\00\009\00\00\00:\00\00\00;\00\00\00<\00\00\00=\00\00\00>\00\00\00?\00\00\00@\00\00\00A\00\00\00B\00\00\00C\00\00\00D\00\00\00E\00\00\00F\00\00\00G\00\00\00H\00\00\00I\00\00\00J\00\00\00K\00\00\00L\00\00\00M\00\00\00N\00\00\00O\00\00\00P\00\00\00Q\00\00\00R\00\00\00S\00\00\00T\00\00\00U\00\00\00V\00\00\00W\00\00\00X\00\00\00Y\00\00\00Z\00\00\00[\00\00\00\\\00\00\00]\00\00\00^\00\00\00_\00\00\00`\00\00\00A\00\00\00B\00\00\00C\00\00\00D\00\00\00E\00\00\00F\00\00\00G\00\00\00H\00\00\00I\00\00\00J\00\00\00K\00\00\00L\00\00\00M\00\00\00N\00\00\00O\00\00\00P\00\00\00Q\00\00\00R\00\00\00S\00\00\00T\00\00\00U\00\00\00V\00\00\00W\00\00\00X\00\00\00Y\00\00\00Z\00\00\00{\00\00\00|\00\00\00}\00\00\00~\00\00\00\7f\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00\00")
-)
diff --git a/test/wast/memory-segment-many.wast b/test/wast/memory-segment-many.wast
deleted file mode 100644
index 3dd5422..0000000
--- a/test/wast/memory-segment-many.wast
+++ /dev/null
@@ -1,6 +0,0 @@
-(module
-  (memory 1)
-  (data (i32.const 0) "hi")
-  (data (i32.const 4) "hello")
-  (data (i32.const 10) "goodbye")
-  (data (i32.const 20) "adios"))
diff --git a/test/wast/memory-segment-multi-string.wast b/test/wast/memory-segment-multi-string.wast
deleted file mode 100644
index 5c434d1..0000000
--- a/test/wast/memory-segment-multi-string.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (memory
-    (data "hi" "there" "how" "are" "you")))
diff --git a/test/wast/module-empty.wast b/test/wast/module-empty.wast
deleted file mode 100644
index 3af8f25..0000000
--- a/test/wast/module-empty.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module)
diff --git a/test/wast/start-named.wast b/test/wast/start-named.wast
deleted file mode 100644
index 16aa37d..0000000
--- a/test/wast/start-named.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (start $foo)
-  (func $foo))
diff --git a/test/wast/start.wast b/test/wast/start.wast
deleted file mode 100644
index fa4a380..0000000
--- a/test/wast/start.wast
+++ /dev/null
@@ -1,3 +0,0 @@
-(module
-  (start 0)
-  (func))
diff --git a/test/wast/table-named.wast b/test/wast/table-named.wast
deleted file mode 100644
index 5d693db..0000000
--- a/test/wast/table-named.wast
+++ /dev/null
@@ -1,5 +0,0 @@
-(module
-  (func $f (param i32))
-  (func $g (param i32 i64))
-  (func $h (result i64) (i64.const 0))
-  (table anyfunc (elem $f $f $g $h)))
diff --git a/test/wast/table.wast b/test/wast/table.wast
deleted file mode 100644
index 4d0c897..0000000
--- a/test/wast/table.wast
+++ /dev/null
@@ -1,5 +0,0 @@
-(module
-  (func (param i32))
-  (func (param i32 i64))
-  (func (result i64) i64.const 0)
-  (table anyfunc (elem 0 0 1 2)))
diff --git a/test/wast/type-empty-param.wast b/test/wast/type-empty-param.wast
deleted file mode 100644
index 69a7cf4..0000000
--- a/test/wast/type-empty-param.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (type (func (param))))
diff --git a/test/wast/type-empty.wast b/test/wast/type-empty.wast
deleted file mode 100644
index d75fc4c..0000000
--- a/test/wast/type-empty.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (type (func)))
diff --git a/test/wast/type-multi-param.wast b/test/wast/type-multi-param.wast
deleted file mode 100644
index a617687..0000000
--- a/test/wast/type-multi-param.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (type (func (param i32 f32 f64) (result f32))))
diff --git a/test/wast/type-no-param.wast b/test/wast/type-no-param.wast
deleted file mode 100644
index b3fc19e..0000000
--- a/test/wast/type-no-param.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (type (func (result i32))))
diff --git a/test/wast/type.wast b/test/wast/type.wast
deleted file mode 100644
index 6d915a8..0000000
--- a/test/wast/type.wast
+++ /dev/null
@@ -1 +0,0 @@
-(module (type (func (param i32) (result i32))))
diff --git a/winter.cabal b/winter.cabal
index 8dc77de..8b37619 100644
--- a/winter.cabal
+++ b/winter.cabal
@@ -1,16 +1,16 @@
 Cabal-Version: 2.2
 Name:          winter
-Version:       1.0.0
+Version:       1.1.0
 Synopsis:      Haskell port of the WebAssembly OCaml reference interpreter
 License:       MIT
 License-file:  LICENSE
-Copyright:     2018-2019 DFINITY Stiftung
+Copyright:     2018-2021 DFINITY Stiftung
 Author:        Enzo Haussecker <enzo@dfinity.org>, John Wiegley <john@dfinity.org>
 Maintainer:    Enzo Haussecker <enzo@dfinity.org>, John Wiegley <john@dfinity.org>
 Stability:     Experimental
 Category:      Interpreter
-Homepage:      https://github.com/dfinity/winter
-Bug-Reports:   https://github.com/dfinity/winter/issues
+Homepage:      https://github.com/dfinity-side-projects/winter
+Bug-Reports:   https://github.com/dfinity-side-projects/winter/issues
 Build-Type:    Simple
 
 Common generic