diff --git a/src/room/GroupCallView.test.tsx b/src/room/GroupCallView.test.tsx
index 8c4a276a..ea14f5cf 100644
--- a/src/room/GroupCallView.test.tsx
+++ b/src/room/GroupCallView.test.tsx
@@ -150,6 +150,7 @@ function createGroupCallView(
   const muteState = {
     audio: { enabled: false },
     video: { enabled: false },
+    // TODO-MULTI-SFU: This cast isn't valid, it's likely the cause of some current test failures
   } as unknown as MuteStates;
   const { getByText } = render(
     <BrowserRouter>
@@ -166,6 +167,7 @@ function createGroupCallView(
               rtcSession={rtcSession as unknown as MatrixRTCSession}
               muteStates={muteState}
               widget={widget}
+              // TODO-MULTI-SFU: Make joined and setJoined work
               joined={true}
               setJoined={function (value: boolean): void {}}
             />
diff --git a/src/room/InCallView.test.tsx b/src/room/InCallView.test.tsx
index d2694120..131259da 100644
--- a/src/room/InCallView.test.tsx
+++ b/src/room/InCallView.test.tsx
@@ -136,6 +136,7 @@ function createInCallView(): RenderResult & {
   const muteState = {
     audio: { enabled: false },
     video: { enabled: false },
+    // TODO-MULTI-SFU: This cast isn't valid, it's likely the cause of some current test failures
   } as unknown as MuteStates;
   const livekitRoom = mockLivekitRoom(
     {
diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index dacb7eb1..658f9fbe 100644
--- a/src/room/InCallView.tsx
+++ b/src/room/InCallView.tsx
@@ -205,7 +205,7 @@ export const InCallView: FC<InCallViewProps> = ({
     useReactionsSender();
 
   useWakeLock();
-  // TODO multi-sfu This is unused now??
+  // TODO-MULTI-SFU This is unused now??
   // const connectionState = useObservableEagerState(vm.livekitConnectionState$);
 
   // annoyingly we don't get the disconnection reason this way,
diff --git a/src/room/VideoPreview.test.tsx b/src/room/VideoPreview.test.tsx
index 17a05e34..dba65727 100644
--- a/src/room/VideoPreview.test.tsx
+++ b/src/room/VideoPreview.test.tsx
@@ -41,7 +41,7 @@ describe("VideoPreview", () => {
     const { queryByRole } = render(
       <VideoPreview
         matrixInfo={matrixInfo}
-        videoEnabled={true}
+        videoEnabled={false}
         videoTrack={null}
         children={<></>}
       />,
@@ -53,7 +53,7 @@ describe("VideoPreview", () => {
     const { queryByRole } = render(
       <VideoPreview
         matrixInfo={matrixInfo}
-        videoEnabled={true}
+        videoEnabled
         videoTrack={null}
         children={<></>}
       />,