diff --git a/lib/tests/test-vm.sx b/lib/tests/test-vm.sx
index 9f54c1a2..cc63dd6a 100644
--- a/lib/tests/test-vm.sx
+++ b/lib/tests/test-vm.sx
@@ -730,3 +730,51 @@
         (quote (define run (fn () (+ (inc 0) (inc 10) (inc 20)))))
         g)
       (assert-equal 33 (vm-eval-with (quote (run)) g)))))
+
+(defsuite
+  "vm-ho-forms"
+  (deftest
+    "map in vm-eval"
+    (assert-equal
+      (list 2 4 6)
+      (vm-eval (quote (map (fn (x) (* x 2)) (list 1 2 3))))))
+  (deftest
+    "filter in vm-eval"
+    (assert-equal
+      (list 2 3 4)
+      (vm-eval (quote (filter (fn (x) (> x 1)) (list 1 2 3 4))))))
+  (deftest
+    "reduce in vm-eval"
+    (assert-equal
+      10
+      (vm-eval (quote (reduce (fn (acc x) (+ acc x)) 0 (list 1 2 3 4))))))
+  (deftest
+    "for-each with set! in vm-eval"
+    (assert-equal
+      6
+      (vm-eval
+        (quote
+          (let
+            ((sum 0))
+            (for-each (fn (x) (set! sum (+ sum x))) (list 1 2 3))
+            sum)))))
+  (deftest
+    "some in vm-eval"
+    (assert-true
+      (vm-eval (quote (some (fn (x) (> x 3)) (list 1 2 3 4))))))
+  (deftest
+    "every? in vm-eval"
+    (assert-false
+      (vm-eval (quote (every? (fn (x) (> x 0)) (list 1 2 -1))))))
+  (deftest
+    "nested map in vm-eval"
+    (assert-equal
+      (list 1 4 9)
+      (vm-eval (quote (map (fn (x) (* x x)) (list 1 2 3))))))
+  (deftest
+    "map with closure over local"
+    (assert-equal
+      (list 11 12 13)
+      (vm-eval
+        (quote
+          (let ((offset 10)) (map (fn (x) (+ x offset)) (list 1 2 3))))))))
diff --git a/web/tests/test-wasm-browser.sx b/web/tests/test-wasm-browser.sx
index f0db07ea..603c5ab6 100644
--- a/web/tests/test-wasm-browser.sx
+++ b/web/tests/test-wasm-browser.sx
@@ -303,3 +303,34 @@
             ((el (with-island-scope (fn (x) (append! d x)) (fn () (render-to-dom (quote (div :class (deref test-reactive-sig) "content")) (global-env) nil)))))
             (reset! test-reactive-sig "after")
             (dom-get-attr el "class")))))))
+
+(defsuite
+  "wasm-scope-context"
+  (deftest
+    "scope-push + context reads value"
+    (scope-push! "test-scope" "hello")
+    (let
+      ((v (context "test-scope" nil)))
+      (scope-pop! "test-scope")
+      (assert-equal "hello" v)))
+  (deftest
+    "context returns default when not pushed"
+    (assert-equal "default" (context "nonexistent-scope" "default")))
+  (deftest
+    "nested scope-push shadows outer"
+    (scope-push! "test-nest" "outer")
+    (scope-push! "test-nest" "inner")
+    (let
+      ((v (context "test-nest" nil)))
+      (scope-pop! "test-nest")
+      (scope-pop! "test-nest")
+      (assert-equal "inner" v)))
+  (deftest
+    "scope-pop reveals outer"
+    (scope-push! "test-reveal" "outer")
+    (scope-push! "test-reveal" "inner")
+    (scope-pop! "test-reveal")
+    (let
+      ((v (context "test-reveal" nil)))
+      (scope-pop! "test-reveal")
+      (assert-equal "outer" v))))