diff --git a/examples/raw-websocket-handler-proxy/src/backend/server.ts b/examples/raw-websocket-handler-proxy/src/backend/server.ts
index 67772622c..5cd996920 100644
--- a/examples/raw-websocket-handler-proxy/src/backend/server.ts
+++ b/examples/raw-websocket-handler-proxy/src/backend/server.ts
@@ -3,7 +3,9 @@ import { createNodeWebSocket } from "@hono/node-ws";
 import { Hono } from "hono";
 import { registry } from "./registry.js";
 
-const { client } = registry.createServer();
+const { client, hono } = registry.createServer({
+	getUpgradeWebSocket: () => upgradeWebSocket,
+});
 
 const app = new Hono();
 const { injectWebSocket, upgradeWebSocket } = createNodeWebSocket({ app });
@@ -45,5 +47,8 @@ app.get(
 	}),
 );
 
+// Mount RivetKit's registry (optional, but required for Studio integration)
+app.route("/registry", hono);
+
 const server = serve({ port: 8080, fetch: app.fetch });
 injectWebSocket(server);
diff --git a/examples/raw-websocket-handler-proxy/src/frontend/App.tsx b/examples/raw-websocket-handler-proxy/src/frontend/App.tsx
index ba25e4d29..a11990d58 100644
--- a/examples/raw-websocket-handler-proxy/src/frontend/App.tsx
+++ b/examples/raw-websocket-handler-proxy/src/frontend/App.tsx
@@ -16,7 +16,7 @@ export default function App() {
 			`conn_params.${encodeURIComponent(JSON.stringify({ apiKey: "your-api-key" }))}`
 		];
 
-		const ws = new WebSocket("ws://localhost:8080/registry/actors/chatRoom/ws/", protocols);
+		const ws = new WebSocket("ws://localhost:8080/registry/actors/raw/websocket/", protocols);
 		
 		ws.onopen = () => {
 			setIsConnected(true);
diff --git a/examples/raw-websocket-handler-proxy/tests/basic.test.ts b/examples/raw-websocket-handler-proxy/tests/basic.test.ts
index 2690f785b..087012c21 100644
--- a/examples/raw-websocket-handler-proxy/tests/basic.test.ts
+++ b/examples/raw-websocket-handler-proxy/tests/basic.test.ts
@@ -27,7 +27,6 @@ describe("basic websocket test", () => {
 
 		expect(initMessage.type).toBe("init");
 		expect(initMessage.messages).toEqual([]);
-		expect(initMessage.users).toBeDefined();
 
 		// Send a message
 		ws.send(JSON.stringify({ type: "message", text: "Hello!" }));
diff --git a/packages/core/src/test/mod.ts b/packages/core/src/test/mod.ts
index c60852a13..72375a313 100644
--- a/packages/core/src/test/mod.ts
+++ b/packages/core/src/test/mod.ts
@@ -5,10 +5,8 @@ import { type TestContext, vi } from "vitest";
 import { type Client, createClient } from "@/client/mod";
 import { createFileSystemOrMemoryDriver } from "@/drivers/file-system/mod";
 import { createInlineClientDriver } from "@/inline-client-driver/mod";
-import { getStudioUrl } from "@/inspector/utils";
 import { createManagerRouter } from "@/manager/router";
 import type { Registry } from "@/registry/mod";
-import { RunConfigSchema } from "@/registry/run-config";
 import { ConfigSchema, type InputConfig } from "./config";
 import { logger } from "./log";
 
@@ -27,12 +25,11 @@ function serve(registry: Registry<any>, inputConfig?: InputConfig): ServerType {
 	}
 
 	// Create router
-	const runConfig = RunConfigSchema.parse(inputConfig);
 	const managerDriver = config.driver.manager(registry.config, config);
 	const inlineClientDriver = createInlineClientDriver(managerDriver);
 	const { router } = createManagerRouter(
 		registry.config,
-		runConfig,
+		config,
 		inlineClientDriver,
 		managerDriver,
 	);