diff --git a/Makefile b/Makefile
index d87ef061..2bbe3468 100644
--- a/Makefile
+++ b/Makefile
@@ -29,11 +29,12 @@ tests/generated: json
 
 # test runs Go and TinyGo tests
 GOTESTARGS :=
+GOTESTMODULES := ./... ./cm/...
 .PHONY: test
 test:
-	go test $(GOTESTARGS) ./...
-	GOARCH=wasm GOOS=wasip1 go test $(GOTESTARGS) ./...
-	tinygo test $(GOTESTARGS) ./...
-	tinygo test -target=wasip1 $(GOTESTARGS) ./...
-	tinygo test -target=wasip2 $(GOTESTARGS) ./...
+	go test $(GOTESTARGS) $(GOTESTMODULES)
+	GOARCH=wasm GOOS=wasip1 go test $(GOTESTARGS) $(GOTESTMODULES)
+	tinygo test $(GOTESTARGS) $(GOTESTMODULES)
+	tinygo test -target=wasip1 $(GOTESTARGS) $(GOTESTMODULES)
+	tinygo test -target=wasip2 $(GOTESTARGS) $(GOTESTMODULES)
 	tinygo test -target=wasip2 $(GOTESTARGS) ./tests/...
diff --git a/go.mod b/go.mod
index 2e4b4b07..119afca1 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/regclient/regclient v0.7.2
 	github.com/sergi/go-diff v1.3.1
 	github.com/urfave/cli/v3 v3.0.0-beta1
+	go.bytecodealliance.org/cm v0.1.0
 	golang.org/x/mod v0.22.0
 	golang.org/x/tools v0.28.0
 )
diff --git a/go.sum b/go.sum
index 5298a548..f2c5dccb 100644
--- a/go.sum
+++ b/go.sum
@@ -33,6 +33,10 @@ github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
 github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 github.com/urfave/cli/v3 v3.0.0-beta1 h1:6DTaaUarcM0wX7qj5Hcvs+5Dm3dyUTBbEwIWAjcw9Zg=
 github.com/urfave/cli/v3 v3.0.0-beta1/go.mod h1:FnIeEMYu+ko8zP1F9Ypr3xkZMIDqW3DR92yUtY39q1Y=
+go.bytecodealliance.org/cm v0.1.0-pre.1 h1:Phd29v6p83WATaorcrczB4xaKmQbvBpPdl2nLZRwBuY=
+go.bytecodealliance.org/cm v0.1.0-pre.1/go.mod h1:NZ2UT0DyGhBfpIPOxPMCuG6g1YTR4YF3xweD7mHX5VQ=
+go.bytecodealliance.org/cm v0.1.0 h1:78Rk4d5rgir5Hm+LMFpDWhjmFBWrKDFPSKUwDBj+nwo=
+go.bytecodealliance.org/cm v0.1.0/go.mod h1:NZ2UT0DyGhBfpIPOxPMCuG6g1YTR4YF3xweD7mHX5VQ=
 golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
 golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=