diff --git a/test.sh b/test.sh
index 4a01e654..f2e349cc 100755
--- a/test.sh
+++ b/test.sh
@@ -10,7 +10,7 @@ fi
 
 export DBL_LIB="lib/"
 
-TIMEOUT=1.0
+TIMEOUT=3.0
 
 binary="_build/default/src/$1.exe"
 flags=""
diff --git a/test/stdlib/Map.fram b/test/stdlib/Map.fram
new file mode 100644
index 00000000..80995ad8
--- /dev/null
+++ b/test/stdlib/Map.fram
@@ -0,0 +1,83 @@
+import open Testing
+import /Map
+
+let (Map { module IntMap  }) = Map.make { Key = Int }
+let (Map { module StrMap  }) = Map.make { Key = String }
+let (Map { module IntMap2 }) =
+  Map.make { Key = Int, method lt = fn x y => x > y }
+
+let _ =
+testSuite "isEmpty" (fn _ =>
+  testCase "true" (fn _ =>
+    assertTrue (IntMap.empty {Val=Bool} >.isEmpty));
+  
+  testCase "false" (fn _ =>
+    assertFalse (IntMap.singleton 13 "A" >.isEmpty)));
+
+testSuite "size" (fn _ =>
+  testCase "empty" (fn _ =>
+    assertEq (IntMap.empty {Val=Int}  >.size) 0);
+  
+  testCase "not empty" (fn _ =>
+    assertEq (IntMap.singleton 42 True >.size) 1));
+
+testCase "randomized test" (fn _ =>
+  handle
+    rand = effect () => fn seed =>
+      let seed = (seed * 39989 + 7) % 65536 in
+      resume (seed >> 12) seed
+    return x => fn _ => x
+    finally c => c 0
+  
+  let doExtraTest (map : IntMap.T Int) (bitSet : Int) (bitMap : Int) =
+    assertEq (map.fold (fn _ acc => acc + 1) 0) map.size;
+    let rest = map.fold
+      (fn {key} v bitSet =>
+        let bit = 1 << key in
+        assertTrue ((bitSet &&& bit) != 0);
+        assertEq v (key + (bitMap &&& bit));
+        # check if the order is ascending
+        assertEq (bitSet ^^^ bit) (bitSet &&& (bitSet - 1));
+        bitSet ^^^ bit)
+      bitSet
+    in
+    assertEq rest 0
+
+  let rec randTest (map : IntMap.T _) (bitSet : Int) (bitMap : Int) (n : Int) =
+    if n == 0 then ()
+    else (
+      let op  = rand () in
+      if op == 0 then doExtraTest map bitSet bitMap;
+      let key = rand ()
+      let bit = 1 << key
+      in
+      if (bitSet &&& bit) == 0 then (
+        assertFalse (map.mem key);
+        assertEq (map.find key >.unwrapOr (-1)) (-1);
+        assertEq (map.findErr {~onError = fn () => -1} key) (-1))
+      else (
+        assertTrue (map.mem key);
+        assertEq (map.find key >.unwrapOr (-1)) (key + (bitMap &&& bit));
+        assertEq (map.findErr {~onError = fn () => -1} key)
+          (key + (bitMap &&& bit)));
+      if op < 8 then (
+        let v = if op < 4 then 0 else bit
+        let map = map.add key (key + v)
+        let bitSet = bitSet ||| bit
+        let bitMap = bitMap ^^^ (bitMap &&& bit) ^^^ v
+        in
+        assertTrue (map.mem key);
+        assertEq (map.find key >.unwrapOr (-1)) (key + v);
+        assertEq (map.findErr {~onError = fn () => -1} key) (key + v);
+        randTest map bitSet bitMap (n - 1))
+      else (
+        let map = map.remove key
+        let bitSet = bitSet ^^^ (bitSet &&& bit)
+        in
+        assertFalse (map.mem key);
+        assertEq (map.find key >.unwrapOr (-1)) (-1);
+        assertEq (map.findErr {~onError = fn () => -1} key) (-1);
+        randTest map bitSet bitMap (n - 1))
+    )
+    in
+    randTest IntMap.empty 0 0 1000)
diff --git a/test/stdlib/TestAll.fram b/test/stdlib/TestAll.fram
index 6e9ee1ad..4d987099 100644
--- a/test/stdlib/TestAll.fram
+++ b/test/stdlib/TestAll.fram
@@ -4,6 +4,7 @@ import Base/Pair
 import Base/Show
 import Base/ToString
 import List
+import Map
 import Mutable
 import Prelude
 import State
diff --git a/test/stdlib/stdlib0008_Map.fram b/test/stdlib/stdlib0008_Map.fram
deleted file mode 100644
index 08990af4..00000000
--- a/test/stdlib/stdlib0008_Map.fram
+++ /dev/null
@@ -1,74 +0,0 @@
-import Map
-
-let (Map { module IntMap  }) = Map.make { Key = Int }
-let (Map { module StrMap  }) = Map.make { Key = String }
-let (Map { module IntMap2 }) =
-  Map.make { Key = Int, method lt = fn x y => x > y }
-
-# Basic tests
-let _ =
-  assert (IntMap.empty {Val=Bool} >.isEmpty);
-  assert (IntMap.empty {Val=Int}  >.size == 0);
-  assert (IntMap.singleton 13 "A" >.isEmpty == False);
-  assert (IntMap.singleton 42 True >.size == 1)
-
-# Randomized tests
-handle
-  rand = effect () => fn seed =>
-    let seed = (seed * 39989 + 7) % 65536 in
-    resume (seed >> 12) seed
-  return x => fn _ => x
-  finally c => c 0
-
-let doExtraTest (map : IntMap.T Int) (bitSet : Int) (bitMap : Int) =
-  assert (map.fold (fn _ acc => acc + 1) 0 == map.size);
-  let rest = map.fold
-    (fn {key} v bitSet =>
-      let bit = 1 << key in
-      assert ((bitSet &&& bit) != 0);
-      assert (v == key + (bitMap &&& bit));
-      # check if the order is ascending
-      assert ((bitSet ^^^ bit) == (bitSet &&& (bitSet - 1)));
-      bitSet ^^^ bit)
-    bitSet
-  in
-  assert (rest == 0)
-
-let rec randTest (map : IntMap.T _) (bitSet : Int) (bitMap : Int) (n : Int) =
-  if n == 0 then ()
-  else (
-    let op  = rand () in
-    if op == 0 then doExtraTest map bitSet bitMap;
-    let key = rand ()
-    let bit = 1 << key
-    in
-    if (bitSet &&& bit) == 0 then (
-      assert (not (map.mem key));
-      assert (map.find key >.unwrapOr (-1) == -1);
-      assert (map.findErr {~onError = fn () => -1} key == -1))
-    else (
-      assert (map.mem key);
-      assert (map.find key >.unwrapOr (-1) == key + (bitMap &&& bit));
-      assert (map.findErr {~onError = fn () => -1} key ==
-        key + (bitMap &&& bit)));
-    if op < 8 then (
-      let v = if op < 4 then 0 else bit
-      let map = map.add key (key + v)
-      let bitSet = bitSet ||| bit
-      let bitMap = bitMap ^^^ (bitMap &&& bit) ^^^ v
-      in
-      assert (map.mem key);
-      assert (map.find key >.unwrapOr (-1) == key + v);
-      assert (map.findErr {~onError = fn () => -1} key == key + v);
-      randTest map bitSet bitMap (n - 1))
-    else (
-      let map = map.remove key
-      let bitSet = bitSet ^^^ (bitSet &&& bit)
-      in
-      assert (not (map.mem key));
-      assert (map.find key >.unwrapOr (-1) == -1);
-      assert (map.findErr {~onError = fn () => -1} key == -1);
-      randTest map bitSet bitMap (n - 1))
-  )
-
-let _ = randTest IntMap.empty 0 0 1000
diff --git a/test/test_suite b/test/test_suite
index 0c670684..e80d58ff 100644
--- a/test/test_suite
+++ b/test/test_suite
@@ -20,7 +20,6 @@ run_with_flags simple_examples ""
 function simple_stdlib_tests {
   simple_test test/stdlib/TestAll.fram
   simple_test test/stdlib/stdlib0007_Stream.fram
-  simple_test test/stdlib/stdlib0008_Map.fram
 }
 
 run_with_flags simple_stdlib_tests ""