diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-16-2-snap.png b/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-16-2-snap.png
deleted file mode 100644
index 0cf8e729fa..0000000000
Binary files a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-16-2-snap.png and /dev/null differ
diff --git a/__tests__/html/transcript.activityGrouping.js b/__tests__/html/transcript.activityGrouping.js
deleted file mode 100644
index 5e1a52ddc2..0000000000
--- a/__tests__/html/transcript.activityGrouping.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('transcript', () => {
-  test('with activity grouping test 1', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 2', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 3', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=1&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 4', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=sender&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 5', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 6', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 7', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=0&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 8', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=0&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 9', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 10', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=1&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 11', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=0&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=0&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 12', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=0&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 13', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 14', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 15', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 16', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=0&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 17', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=0&un=0&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 18', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=0&g=status&l=0&rtl=0&t=carousel-layout.json&ui=0&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 19', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=0&g=status&l=stacked&rtl=0&t=carousel-layout.json&ui=0&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 20', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 21', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=stacked&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 22', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=0&bt=1&g=status&l=stacked&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 23', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=0&bt=1&g=status&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 24', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=single-line-no-files.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 25', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 26', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 27', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 28', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=stacked&rtl=0&t=user-upload.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 29', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 30', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=0&g=status&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 31', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=0&g=status&l=stacked&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 32', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=0&g=1&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 33', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=0&g=sender&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 34', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=0&g=sender&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 35', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=0&g=sender&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 36', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=0&g=sender&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=0&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 37', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=0&bt=0&g=sender&l=carousel&rtl=0&t=single-line-no-files.json&ui=0&un=0&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 38', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=sender&l=carousel&rtl=0&t=user-upload.json&ui=0&un=0&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 39', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=sender&l=carousel&rtl=0&t=user-upload.json&ui=0&un=1&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 40', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=0&bn=1&bt=1&g=status&l=carousel&rtl=0&t=user-upload.json&ui=0&un=1&ut=0&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 41', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=attachment-without-message.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 42', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=stacked&rtl=0&t=attachment-without-message.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 43', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 44', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  // Test 45 is slightly (3px) shifted to the right.
-  // This is because the carousel tries to center the first image, which result in setting scrollLeft to 3.3px.
-  test('with activity grouping test 45', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=carousel&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=0&ch=1280'
-    ));
-
-  test('with activity grouping test 46', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=status&l=carousel&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 47', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=0&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 48', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 49', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=stacked&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=0&ch=1280&cw=720'
-    ));
-
-  test('with activity grouping test 50', () =>
-    runHTML(
-      'transcript.activityGrouping#wd=1&bi=1&bn=1&bt=1&g=1&l=stacked&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720'
-    ));
-});
diff --git a/__tests__/html2/activityGrouping/layout.1.html b/__tests__/html2/activityGrouping/layout.1.html
new file mode 100644
index 0000000000..14f32cd4ca
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.1.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-1-1-snap.png b/__tests__/html2/activityGrouping/layout.1.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-1-1-snap.png
rename to __tests__/html2/activityGrouping/layout.1.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.10.html b/__tests__/html2/activityGrouping/layout.10.html
new file mode 100644
index 0000000000..03d2e978af
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.10.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=1&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-10-1-snap.png b/__tests__/html2/activityGrouping/layout.10.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-10-1-snap.png
rename to __tests__/html2/activityGrouping/layout.10.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.11.html b/__tests__/html2/activityGrouping/layout.11.html
new file mode 100644
index 0000000000..5dc9f35840
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.11.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=0&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=0&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-11-1-snap.png b/__tests__/html2/activityGrouping/layout.11.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-11-1-snap.png
rename to __tests__/html2/activityGrouping/layout.11.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.12.html b/__tests__/html2/activityGrouping/layout.12.html
new file mode 100644
index 0000000000..c26cd16c95
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.12.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=0&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-12-1-snap.png b/__tests__/html2/activityGrouping/layout.12.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-12-1-snap.png
rename to __tests__/html2/activityGrouping/layout.12.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.13.html b/__tests__/html2/activityGrouping/layout.13.html
new file mode 100644
index 0000000000..073c4681e3
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.13.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-13-1-snap.png b/__tests__/html2/activityGrouping/layout.13.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-13-1-snap.png
rename to __tests__/html2/activityGrouping/layout.13.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.14.html b/__tests__/html2/activityGrouping/layout.14.html
new file mode 100644
index 0000000000..ef95e5c9f3
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.14.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-14-1-snap.png b/__tests__/html2/activityGrouping/layout.14.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-14-1-snap.png
rename to __tests__/html2/activityGrouping/layout.14.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.15.html b/__tests__/html2/activityGrouping/layout.15.html
new file mode 100644
index 0000000000..54a0ee788f
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.15.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-15-1-snap.png b/__tests__/html2/activityGrouping/layout.15.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-15-1-snap.png
rename to __tests__/html2/activityGrouping/layout.15.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.16.html b/__tests__/html2/activityGrouping/layout.16.html
new file mode 100644
index 0000000000..9b25b2f0e9
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.16.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=0&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-16-1-snap.png b/__tests__/html2/activityGrouping/layout.16.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-16-1-snap.png
rename to __tests__/html2/activityGrouping/layout.16.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.17.html b/__tests__/html2/activityGrouping/layout.17.html
new file mode 100644
index 0000000000..e5e592ad29
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.17.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=carousel-layout.json&ui=0&un=0&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-17-1-snap.png b/__tests__/html2/activityGrouping/layout.17.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-17-1-snap.png
rename to __tests__/html2/activityGrouping/layout.17.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.18.html b/__tests__/html2/activityGrouping/layout.18.html
new file mode 100644
index 0000000000..961be4a661
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.18.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=0&g=status&l=0&rtl=0&t=carousel-layout.json&ui=0&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-18-1-snap.png b/__tests__/html2/activityGrouping/layout.18.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-18-1-snap.png
rename to __tests__/html2/activityGrouping/layout.18.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.19.html b/__tests__/html2/activityGrouping/layout.19.html
new file mode 100644
index 0000000000..e1eb0eb8ee
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.19.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=0&g=status&l=stacked&rtl=0&t=carousel-layout.json&ui=0&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-19-1-snap.png b/__tests__/html2/activityGrouping/layout.19.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-19-1-snap.png
rename to __tests__/html2/activityGrouping/layout.19.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.2.html b/__tests__/html2/activityGrouping/layout.2.html
new file mode 100644
index 0000000000..6b2e64d401
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.2.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-2-1-snap.png b/__tests__/html2/activityGrouping/layout.2.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-2-1-snap.png
rename to __tests__/html2/activityGrouping/layout.2.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.20.html b/__tests__/html2/activityGrouping/layout.20.html
new file mode 100644
index 0000000000..b5fe11739e
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.20.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-20-1-snap.png b/__tests__/html2/activityGrouping/layout.20.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-20-1-snap.png
rename to __tests__/html2/activityGrouping/layout.20.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.21.html b/__tests__/html2/activityGrouping/layout.21.html
new file mode 100644
index 0000000000..44b8a40ee0
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.21.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=stacked&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-21-1-snap.png b/__tests__/html2/activityGrouping/layout.21.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-21-1-snap.png
rename to __tests__/html2/activityGrouping/layout.21.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.22.html b/__tests__/html2/activityGrouping/layout.22.html
new file mode 100644
index 0000000000..1eda5508e7
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.22.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=0&bt=1&g=status&l=stacked&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-22-1-snap.png b/__tests__/html2/activityGrouping/layout.22.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-22-1-snap.png
rename to __tests__/html2/activityGrouping/layout.22.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.23.html b/__tests__/html2/activityGrouping/layout.23.html
new file mode 100644
index 0000000000..6a56b81b47
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.23.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=0&bt=1&g=status&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-23-1-snap.png b/__tests__/html2/activityGrouping/layout.23.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-23-1-snap.png
rename to __tests__/html2/activityGrouping/layout.23.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.24.html b/__tests__/html2/activityGrouping/layout.24.html
new file mode 100644
index 0000000000..6d3a7d7915
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.24.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=single-line-no-files.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-24-1-snap.png b/__tests__/html2/activityGrouping/layout.24.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-24-1-snap.png
rename to __tests__/html2/activityGrouping/layout.24.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.25.html b/__tests__/html2/activityGrouping/layout.25.html
new file mode 100644
index 0000000000..b4837628e4
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.25.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-25-1-snap.png b/__tests__/html2/activityGrouping/layout.25.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-25-1-snap.png
rename to __tests__/html2/activityGrouping/layout.25.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.26.html b/__tests__/html2/activityGrouping/layout.26.html
new file mode 100644
index 0000000000..fd9923c32b
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.26.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-26-1-snap.png b/__tests__/html2/activityGrouping/layout.26.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-26-1-snap.png
rename to __tests__/html2/activityGrouping/layout.26.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.27.html b/__tests__/html2/activityGrouping/layout.27.html
new file mode 100644
index 0000000000..4c805df9a5
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.27.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-27-1-snap.png b/__tests__/html2/activityGrouping/layout.27.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-27-1-snap.png
rename to __tests__/html2/activityGrouping/layout.27.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.28.html b/__tests__/html2/activityGrouping/layout.28.html
new file mode 100644
index 0000000000..4fcdafb1a7
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.28.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=stacked&rtl=0&t=user-upload.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-28-1-snap.png b/__tests__/html2/activityGrouping/layout.28.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-28-1-snap.png
rename to __tests__/html2/activityGrouping/layout.28.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.29.html b/__tests__/html2/activityGrouping/layout.29.html
new file mode 100644
index 0000000000..3c3a0b8a9d
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.29.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-29-1-snap.png b/__tests__/html2/activityGrouping/layout.29.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-29-1-snap.png
rename to __tests__/html2/activityGrouping/layout.29.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.3.html b/__tests__/html2/activityGrouping/layout.3.html
new file mode 100644
index 0000000000..e2e0a21bf1
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.3.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=1&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-3-1-snap.png b/__tests__/html2/activityGrouping/layout.3.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-3-1-snap.png
rename to __tests__/html2/activityGrouping/layout.3.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.30.html b/__tests__/html2/activityGrouping/layout.30.html
new file mode 100644
index 0000000000..5b37ce124e
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.30.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=0&g=status&l=0&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-30-1-snap.png b/__tests__/html2/activityGrouping/layout.30.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-30-1-snap.png
rename to __tests__/html2/activityGrouping/layout.30.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.31.html b/__tests__/html2/activityGrouping/layout.31.html
new file mode 100644
index 0000000000..fc1fd4c336
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.31.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=0&g=status&l=stacked&rtl=0&t=multiple-lines-multiple-files.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-31-1-snap.png b/__tests__/html2/activityGrouping/layout.31.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-31-1-snap.png
rename to __tests__/html2/activityGrouping/layout.31.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.32.html b/__tests__/html2/activityGrouping/layout.32.html
new file mode 100644
index 0000000000..2c5b48def5
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.32.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=0&g=1&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-32-1-snap.png b/__tests__/html2/activityGrouping/layout.32.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-32-1-snap.png
rename to __tests__/html2/activityGrouping/layout.32.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.33.html b/__tests__/html2/activityGrouping/layout.33.html
new file mode 100644
index 0000000000..f5598cb616
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.33.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=1&bt=0&g=sender&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-33-1-snap.png b/__tests__/html2/activityGrouping/layout.33.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-33-1-snap.png
rename to __tests__/html2/activityGrouping/layout.33.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.34.html b/__tests__/html2/activityGrouping/layout.34.html
new file mode 100644
index 0000000000..f5598cb616
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.34.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=1&bt=0&g=sender&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-34-1-snap.png b/__tests__/html2/activityGrouping/layout.34.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-34-1-snap.png
rename to __tests__/html2/activityGrouping/layout.34.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.35.html b/__tests__/html2/activityGrouping/layout.35.html
new file mode 100644
index 0000000000..c54b7f4132
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.35.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location = './layout.skip.html#wd=1&bi=0&bn=1&bt=0&g=sender&l=stacked&rtl=0&t=carousel-layout.json&ui=1&un=1&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-35-1-snap.png b/__tests__/html2/activityGrouping/layout.35.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-35-1-snap.png
rename to __tests__/html2/activityGrouping/layout.35.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.36.html b/__tests__/html2/activityGrouping/layout.36.html
new file mode 100644
index 0000000000..bb6108aba4
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.36.html
@@ -0,0 +1,10 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location = './layout.skip.html#wd=1&bi=0&bn=1&bt=0&g=sender&l=0&rtl=0&t=user-upload.json&ui=1&un=1&ut=0&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-36-1-snap.png b/__tests__/html2/activityGrouping/layout.36.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-36-1-snap.png
rename to __tests__/html2/activityGrouping/layout.36.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.37.html b/__tests__/html2/activityGrouping/layout.37.html
new file mode 100644
index 0000000000..8374edda7a
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.37.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=0&bt=0&g=sender&l=carousel&rtl=0&t=single-line-no-files.json&ui=0&un=0&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-37-1-snap.png b/__tests__/html2/activityGrouping/layout.37.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-37-1-snap.png
rename to __tests__/html2/activityGrouping/layout.37.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.38.html b/__tests__/html2/activityGrouping/layout.38.html
new file mode 100644
index 0000000000..dd1e1ed980
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.38.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=sender&l=carousel&rtl=0&t=user-upload.json&ui=0&un=0&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-38-1-snap.png b/__tests__/html2/activityGrouping/layout.38.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-38-1-snap.png
rename to __tests__/html2/activityGrouping/layout.38.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.39.html b/__tests__/html2/activityGrouping/layout.39.html
new file mode 100644
index 0000000000..df8084c348
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.39.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=sender&l=carousel&rtl=0&t=user-upload.json&ui=0&un=1&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-39-1-snap.png b/__tests__/html2/activityGrouping/layout.39.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-39-1-snap.png
rename to __tests__/html2/activityGrouping/layout.39.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.4.html b/__tests__/html2/activityGrouping/layout.4.html
new file mode 100644
index 0000000000..d6cbb407eb
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.4.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=sender&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-4-1-snap.png b/__tests__/html2/activityGrouping/layout.4.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-4-1-snap.png
rename to __tests__/html2/activityGrouping/layout.4.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.40.html b/__tests__/html2/activityGrouping/layout.40.html
new file mode 100644
index 0000000000..769c718155
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.40.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=1&bt=1&g=status&l=carousel&rtl=0&t=user-upload.json&ui=0&un=1&ut=0&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-40-1-snap.png b/__tests__/html2/activityGrouping/layout.40.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-40-1-snap.png
rename to __tests__/html2/activityGrouping/layout.40.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.41.html b/__tests__/html2/activityGrouping/layout.41.html
new file mode 100644
index 0000000000..e697304ed8
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.41.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=attachment-without-message.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-41-1-snap.png b/__tests__/html2/activityGrouping/layout.41.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-41-1-snap.png
rename to __tests__/html2/activityGrouping/layout.41.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.42.html b/__tests__/html2/activityGrouping/layout.42.html
new file mode 100644
index 0000000000..d777657e31
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.42.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=stacked&rtl=0&t=attachment-without-message.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-42-1-snap.png b/__tests__/html2/activityGrouping/layout.42.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-42-1-snap.png
rename to __tests__/html2/activityGrouping/layout.42.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.43.html b/__tests__/html2/activityGrouping/layout.43.html
new file mode 100644
index 0000000000..987cc0e030
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.43.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-43-1-snap.png b/__tests__/html2/activityGrouping/layout.43.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-43-1-snap.png
rename to __tests__/html2/activityGrouping/layout.43.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.44.html b/__tests__/html2/activityGrouping/layout.44.html
new file mode 100644
index 0000000000..94ac642cbf
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.44.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=0&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-44-1-snap.png b/__tests__/html2/activityGrouping/layout.44.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-44-1-snap.png
rename to __tests__/html2/activityGrouping/layout.44.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.45.html b/__tests__/html2/activityGrouping/layout.45.html
new file mode 100644
index 0000000000..882cc23cc1
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.45.html
@@ -0,0 +1,13 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      // Test 45 is slightly (3px) shifted to the right.
+      // This is because the carousel tries to center the first image, which result in setting scrollLeft to 3.3px.
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=carousel&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-45-1-snap.png b/__tests__/html2/activityGrouping/layout.45.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-45-1-snap.png
rename to __tests__/html2/activityGrouping/layout.45.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.46.html b/__tests__/html2/activityGrouping/layout.46.html
new file mode 100644
index 0000000000..3111d04253
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.46.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=status&l=carousel&rtl=0&t=markdown-message.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-46-1-snap.png b/__tests__/html2/activityGrouping/layout.46.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-46-1-snap.png
rename to __tests__/html2/activityGrouping/layout.46.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.47.html b/__tests__/html2/activityGrouping/layout.47.html
new file mode 100644
index 0000000000..94b03e66c5
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.47.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=0&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-47-1-snap.png b/__tests__/html2/activityGrouping/layout.47.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-47-1-snap.png
rename to __tests__/html2/activityGrouping/layout.47.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.48.html b/__tests__/html2/activityGrouping/layout.48.html
new file mode 100644
index 0000000000..929c919675
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.48.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-48-1-snap.png b/__tests__/html2/activityGrouping/layout.48.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-48-1-snap.png
rename to __tests__/html2/activityGrouping/layout.48.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.49.html b/__tests__/html2/activityGrouping/layout.49.html
new file mode 100644
index 0000000000..82668e86e1
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.49.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=stacked&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=0&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-49-1-snap.png b/__tests__/html2/activityGrouping/layout.49.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-49-1-snap.png
rename to __tests__/html2/activityGrouping/layout.49.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.5.html b/__tests__/html2/activityGrouping/layout.5.html
new file mode 100644
index 0000000000..0f5f3edf53
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.5.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-5-1-snap.png b/__tests__/html2/activityGrouping/layout.5.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-5-1-snap.png
rename to __tests__/html2/activityGrouping/layout.5.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.50.html b/__tests__/html2/activityGrouping/layout.50.html
new file mode 100644
index 0000000000..045ccd4c5f
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.50.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=stacked&rtl=0&t=carousel-hero-cards.json&ui=1&un=1&ut=1&w=1&ch=1280&cw=720';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-50-1-snap.png b/__tests__/html2/activityGrouping/layout.50.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-50-1-snap.png
rename to __tests__/html2/activityGrouping/layout.50.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.6.html b/__tests__/html2/activityGrouping/layout.6.html
new file mode 100644
index 0000000000..ff1eae81d2
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.6.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-6-1-snap.png b/__tests__/html2/activityGrouping/layout.6.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-6-1-snap.png
rename to __tests__/html2/activityGrouping/layout.6.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.7.html b/__tests__/html2/activityGrouping/layout.7.html
new file mode 100644
index 0000000000..1bbc19baf6
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.7.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=0&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-7-1-snap.png b/__tests__/html2/activityGrouping/layout.7.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-7-1-snap.png
rename to __tests__/html2/activityGrouping/layout.7.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.8.html b/__tests__/html2/activityGrouping/layout.8.html
new file mode 100644
index 0000000000..0692c24d0d
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.8.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=0&bn=1&bt=0&g=1&l=0&rtl=0&t=simple-messages.json&ui=1&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-8-1-snap.png b/__tests__/html2/activityGrouping/layout.8.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-8-1-snap.png
rename to __tests__/html2/activityGrouping/layout.8.html.snap-1.png
diff --git a/__tests__/html2/activityGrouping/layout.9.html b/__tests__/html2/activityGrouping/layout.9.html
new file mode 100644
index 0000000000..ef100fa8d0
--- /dev/null
+++ b/__tests__/html2/activityGrouping/layout.9.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html>
+  <head>
+    <title></title>
+    <script>
+      location =
+        './layout.skip.html#wd=1&bi=1&bn=1&bt=1&g=1&l=0&rtl=0&t=simple-messages.json&ui=0&un=1&ut=1&w=0&ch=1280';
+    </script>
+  </head>
+  <body></body>
+</html>
diff --git a/__tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-9-1-snap.png b/__tests__/html2/activityGrouping/layout.9.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/transcript-activity-grouping-js-transcript-with-activity-grouping-test-9-1-snap.png
rename to __tests__/html2/activityGrouping/layout.9.html.snap-1.png
diff --git a/__tests__/html/transcript.activityGrouping.html b/__tests__/html2/activityGrouping/layout.skip.html
similarity index 98%
rename from __tests__/html/transcript.activityGrouping.html
rename to __tests__/html2/activityGrouping/layout.skip.html
index 56837f1246..dcebae08f5 100644
--- a/__tests__/html/transcript.activityGrouping.html
+++ b/__tests__/html2/activityGrouping/layout.skip.html
@@ -79,7 +79,7 @@
         await pageConditions.allImagesLoaded();
         await pageConditions.scrollToBottomCompleted();
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>