diff --git a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
index 9fe9c83bd..1bf5a0a05 100644
--- a/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/loadMore.spec.tsx.snap
@@ -27,7 +27,7 @@ exports[`loads more comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨6⁩ Comments
+        ⁨2⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
index aaab7f1d2..dc408c24e 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkView.spec.tsx.snap
@@ -158,7 +158,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨6⁩ Comments
+        ⁨2⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
index 1099468ac..209fbe533 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewAssetNotFound.spec.tsx.snap
@@ -1,7 +1,40 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders permalink view with unknown asset 1`] = `
-<div>
-  Asset not found
+<div
+  className="HorizontalGutter-root App-root HorizontalGutter-full"
+>
+  <ul
+    className="TabBar-root TabBar-primary"
+    role="tablist"
+  >
+    <svg
+      className="Spinner-spinner"
+      height="40px"
+      viewBox="0 0 66 66"
+      width="40px"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <circle
+        className="Spinner-path"
+        cx="33"
+        cy="33"
+        fill="none"
+        r="30"
+        strokeLinecap="round"
+        strokeWidth="6"
+      />
+    </svg>
+  </ul>
+  <section
+    aria-labelledby="tab-COMMENTS"
+    className="App-tabContent"
+    id="tabPane-COMMENTS"
+    role="tabpanel"
+  >
+    <div>
+      Asset not found
+    </div>
+  </section>
 </div>
 `;
diff --git a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
index 18657738a..a38d7cbb8 100644
--- a/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/permalinkViewCommentNotFound.spec.tsx.snap
@@ -93,7 +93,7 @@ exports[`show all comments 1`] = `
         role="tab"
         type="button"
       >
-        ⁨6⁩ Comments
+        ⁨2⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
index 84fc3d4eb..1043bdc40 100644
--- a/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
+++ b/src/core/client/stream/test/comments/__snapshots__/showAllReplies.spec.tsx.snap
@@ -389,7 +389,7 @@ exports[`show all replies 1`] = `
         role="tab"
         type="button"
       >
-        ⁨6⁩ Comments
+        ⁨2⁩ Comments
       </button>
     </li>
   </ul>
diff --git a/src/core/client/stream/test/create.tsx b/src/core/client/stream/test/create.tsx
index 4f32b73c7..432d9800a 100644
--- a/src/core/client/stream/test/create.tsx
+++ b/src/core/client/stream/test/create.tsx
@@ -15,7 +15,7 @@ import createEnvironment from "./createEnvironment";
 import createFluentBundle from "./createFluentBundle";
 import createNodeMock from "./createNodeMock";
 
-import AppQuery from "../queries/AppQuery";
+import AppContainer from "../containers/AppContainer";
 
 export interface CreateParams {
   logNetwork?: boolean;
@@ -54,7 +54,7 @@ export default function create(params: CreateParams) {
 
   const testRenderer = TestRenderer.create(
     <TalkContextProvider value={context}>
-      <AppQuery />
+      <AppContainer />
     </TalkContextProvider>,
     { createNodeMock }
   );