diff --git a/Makefile b/Makefile
index 8f6bd0203..b17d91b7a 100644
--- a/Makefile
+++ b/Makefile
@@ -47,7 +47,7 @@ endif
 
 .DELETE_ON_ERROR:
 
-.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test
+.PHONY: all metadata install clean format cli uis ui reflash deb $(IMAGE_TYPE) squashfs sudo wormhole wormhole-deb test test-core test-sdk test-container-runtime
 
 all: $(ALL_TARGETS)
 
@@ -89,10 +89,16 @@ clean:
 format:
 	cd core && cargo +nightly fmt
 
-test: $(CORE_SRC) $(ENVIRONMENT_FILE) 
-	(cd core && cargo build  --features=test && cargo test --features=test)
-	(cd sdk && make test)
-	(cd container-runtime && npm ci && npm test)
+test: | test-core test-sdk test-container-runtime
+
+test-core: $(CORE_SRC) $(ENVIRONMENT_FILE) 
+	cd core && cargo build --features=test && cargo test --features=test
+
+test-sdk: $(shell git ls-files sdk) sdk/lib/osBindings
+	cd sdk && make test
+
+test-container-runtime: container-runtime/node_modules $(shell git ls-files container-runtime/src) container-runtime/package.json container-runtime/tsconfig.json 
+	cd container-runtime && npm test
 
 cli:
 	cd core && ./install-cli.sh
diff --git a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
index 1d434c78d..369e8fa4b 100644
--- a/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
+++ b/container-runtime/src/Adapters/Systems/SystemForEmbassy/__snapshots__/transformConfigSpec.test.ts.snap
@@ -76,8 +76,8 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
             "required": false,
             "type": "select",
             "values": {
-              "filebrowser": undefined,
-              "nextcloud": undefined,
+              "filebrowser": "filebrowser",
+              "nextcloud": "nextcloud",
             },
             "warning": null,
           },
@@ -192,8 +192,8 @@ exports[`transformConfigSpec transformConfigSpec(embassyPages) 1`] = `
                   "required": false,
                   "type": "select",
                   "values": {
-                    "filebrowser": undefined,
-                    "nextcloud": undefined,
+                    "filebrowser": "filebrowser",
+                    "nextcloud": "nextcloud",
                   },
                   "warning": null,
                 },
diff --git a/sdk/lib/osBindings/ApiState.ts b/sdk/lib/osBindings/ApiState.ts
new file mode 100644
index 000000000..c3a43828a
--- /dev/null
+++ b/sdk/lib/osBindings/ApiState.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type ApiState = "error" | "initializing" | "running"
diff --git a/sdk/lib/osBindings/EchoParams.ts b/sdk/lib/osBindings/EchoParams.ts
new file mode 100644
index 000000000..232dfb8ab
--- /dev/null
+++ b/sdk/lib/osBindings/EchoParams.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type EchoParams = { message: string }
diff --git a/sdk/lib/osBindings/index.ts b/sdk/lib/osBindings/index.ts
index 2bf2bf69c..2708aef8c 100644
--- a/sdk/lib/osBindings/index.ts
+++ b/sdk/lib/osBindings/index.ts
@@ -15,6 +15,7 @@ export { AlpnInfo } from "./AlpnInfo"
 export { AnySignature } from "./AnySignature"
 export { AnySigningKey } from "./AnySigningKey"
 export { AnyVerifyingKey } from "./AnyVerifyingKey"
+export { ApiState } from "./ApiState"
 export { AttachParams } from "./AttachParams"
 export { BackupProgress } from "./BackupProgress"
 export { BackupTargetFS } from "./BackupTargetFS"
@@ -42,6 +43,7 @@ export { DepInfo } from "./DepInfo"
 export { Description } from "./Description"
 export { DestroyOverlayedImageParams } from "./DestroyOverlayedImageParams"
 export { Duration } from "./Duration"
+export { EchoParams } from "./EchoParams"
 export { EncryptedWire } from "./EncryptedWire"
 export { ExecuteAction } from "./ExecuteAction"
 export { ExportActionParams } from "./ExportActionParams"