diff --git a/__tests__/html/citation.accordion.js b/__tests__/html/citation.accordion.js
deleted file mode 100644
index 62f0b1cc6d..0000000000
--- a/__tests__/html/citation.accordion.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation accordion', () => {
-  test('should expand and collapse on click', () => runHTML('citation.accordion.html'));
-});
diff --git a/__tests__/html/citation.basic.js b/__tests__/html/citation.basic.js
deleted file mode 100644
index 28180cc53c..0000000000
--- a/__tests__/html/citation.basic.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation', () => {
-  test('should display', () => runHTML('citation.basic.html'));
-});
diff --git a/__tests__/html/citation.showModal.close.button.js b/__tests__/html/citation.showModal.close.button.js
deleted file mode 100644
index d7e45dadfb..0000000000
--- a/__tests__/html/citation.showModal.close.button.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation modal dialog', () => {
-  test('should close when clicking on close button', () => runHTML('citation.showModal.close.button.html'));
-});
diff --git a/__tests__/html/citation.showModal.close.escape.js b/__tests__/html/citation.showModal.close.escape.js
deleted file mode 100644
index 57e29fd920..0000000000
--- a/__tests__/html/citation.showModal.close.escape.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation modal dialog', () => {
-  test('should close when escape key is pressed', () => runHTML('citation.showModal.close.escape.html'));
-});
diff --git a/__tests__/html/citation.showModal.linkDefinitions.js b/__tests__/html/citation.showModal.linkDefinitions.js
deleted file mode 100644
index 16bb195997..0000000000
--- a/__tests__/html/citation.showModal.linkDefinitions.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation modal dialog', () => {
-  test('should show when clicking on citation in link definitions', () => runHTML('citation.showModal.linkDefinitions.html'));
-});
diff --git a/__tests__/html/citation.showModal.markdown.js b/__tests__/html/citation.showModal.markdown.js
deleted file mode 100644
index 43311aec8c..0000000000
--- a/__tests__/html/citation.showModal.markdown.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation modal dialog', () => {
-  test('should show when clicking on citation in Markdown', () => runHTML('citation.showModal.markdown.html'));
-});
diff --git a/__tests__/html/citation.showModal.width.desktop.js b/__tests__/html/citation.showModal.width.desktop.js
deleted file mode 100644
index e3a53f035b..0000000000
--- a/__tests__/html/citation.showModal.width.desktop.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation modal dialog', () => {
-  test('should show 60% on desktop', () => runHTML('citation.showModal.width.desktop.html'));
-});
diff --git a/__tests__/html/citation.showModal.width.mobile.js b/__tests__/html/citation.showModal.width.mobile.js
deleted file mode 100644
index d2bbc3a99c..0000000000
--- a/__tests__/html/citation.showModal.width.mobile.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('citation modal dialog', () => {
-  test('should show full-width on mobile device', () => runHTML('citation.showModal.width.mobile.html'));
-});
diff --git a/__tests__/html/citation.accordion.html b/__tests__/html2/citation/accordion.html
similarity index 94%
rename from __tests__/html/citation.accordion.html
rename to __tests__/html2/citation/accordion.html
index 866c3f90a3..f96117aac2 100644
--- a/__tests__/html/citation.accordion.html
+++ b/__tests__/html2/citation/accordion.html
@@ -41,15 +41,15 @@
           type: 'message'
         });
 
-        await host.snapshot();
+        await host.snapshot('local');
 
         const summary = pageElements.linkDefinitions()[0].querySelector('summary');
 
         await host.click(summary);
-        await host.snapshot();
+        await host.snapshot('local');
 
         await host.click(summary);
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-accordion-js-citation-accordion-should-expand-and-collapse-on-click-1-snap.png b/__tests__/html2/citation/accordion.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-accordion-js-citation-accordion-should-expand-and-collapse-on-click-1-snap.png
rename to __tests__/html2/citation/accordion.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-accordion-js-citation-accordion-should-expand-and-collapse-on-click-2-snap.png b/__tests__/html2/citation/accordion.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-accordion-js-citation-accordion-should-expand-and-collapse-on-click-2-snap.png
rename to __tests__/html2/citation/accordion.html.snap-2.png
diff --git a/__tests__/__image_snapshots__/html/citation-accordion-js-citation-accordion-should-expand-and-collapse-on-click-3-snap.png b/__tests__/html2/citation/accordion.html.snap-3.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-accordion-js-citation-accordion-should-expand-and-collapse-on-click-3-snap.png
rename to __tests__/html2/citation/accordion.html.snap-3.png
diff --git a/__tests__/html/citation.basic.html b/__tests__/html2/citation/basic.html
similarity index 98%
rename from __tests__/html/citation.basic.html
rename to __tests__/html2/citation/basic.html
index 374f3da9cf..19919bac67 100644
--- a/__tests__/html/citation.basic.html
+++ b/__tests__/html2/citation/basic.html
@@ -42,7 +42,7 @@
           type: 'message'
         });
 
-        await host.snapshot();
+        await host.snapshot('local');
 
         const markdownElement = pageElements.activities()[0].querySelector('.webchat__text-content__markdown');
         const markdownLinks = markdownElement.querySelectorAll('a');
diff --git a/__tests__/__image_snapshots__/html/citation-basic-js-citation-should-display-1-snap.png b/__tests__/html2/citation/basic.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-basic-js-citation-should-display-1-snap.png
rename to __tests__/html2/citation/basic.html.snap-1.png
diff --git a/__tests__/html/citation.showModal.close.button.html b/__tests__/html2/citation/showModal.close.button.html
similarity index 96%
rename from __tests__/html/citation.showModal.close.button.html
rename to __tests__/html2/citation/showModal.close.button.html
index d6ebf6e34a..f6b12539c6 100644
--- a/__tests__/html/citation.showModal.close.button.html
+++ b/__tests__/html2/citation/showModal.close.button.html
@@ -45,10 +45,10 @@
         const markdownButtons = markdownElement.querySelectorAll('button');
 
         await host.click(markdownButtons[0]);
-        await host.snapshot();
+        await host.snapshot('local');
 
         await host.sendKeys(' ');
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-close-button-js-citation-modal-dialog-should-close-when-clicking-on-close-button-1-snap.png b/__tests__/html2/citation/showModal.close.button.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-close-button-js-citation-modal-dialog-should-close-when-clicking-on-close-button-1-snap.png
rename to __tests__/html2/citation/showModal.close.button.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-close-button-js-citation-modal-dialog-should-close-when-clicking-on-close-button-2-snap.png b/__tests__/html2/citation/showModal.close.button.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-close-button-js-citation-modal-dialog-should-close-when-clicking-on-close-button-2-snap.png
rename to __tests__/html2/citation/showModal.close.button.html.snap-2.png
diff --git a/__tests__/html/citation.showModal.close.escape.html b/__tests__/html2/citation/showModal.close.escape.html
similarity index 96%
rename from __tests__/html/citation.showModal.close.escape.html
rename to __tests__/html2/citation/showModal.close.escape.html
index 1d416e2745..9391d3782e 100644
--- a/__tests__/html/citation.showModal.close.escape.html
+++ b/__tests__/html2/citation/showModal.close.escape.html
@@ -45,11 +45,11 @@
         const markdownButtons = markdownElement.querySelectorAll('button');
 
         await host.click(markdownButtons[0]);
-        await host.snapshot();
+        await host.snapshot('local');
 
         await host.sendTab();
         await host.sendKeys('ESCAPE');
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-close-escape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-1-snap.png b/__tests__/html2/citation/showModal.close.escape.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-close-escape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-1-snap.png
rename to __tests__/html2/citation/showModal.close.escape.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-close-escape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-2-snap.png b/__tests__/html2/citation/showModal.close.escape.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-close-escape-js-citation-modal-dialog-should-close-when-escape-key-is-pressed-2-snap.png
rename to __tests__/html2/citation/showModal.close.escape.html.snap-2.png
diff --git a/__tests__/html/citation.showModal.linkDefinitions.html b/__tests__/html2/citation/showModal.linkDefinitions.html
similarity index 96%
rename from __tests__/html/citation.showModal.linkDefinitions.html
rename to __tests__/html2/citation/showModal.linkDefinitions.html
index ce763febca..03791dbff5 100644
--- a/__tests__/html/citation.showModal.linkDefinitions.html
+++ b/__tests__/html2/citation/showModal.linkDefinitions.html
@@ -45,10 +45,10 @@
         const linkDefinitionItems = pageElements.linkDefinitions()[0].querySelectorAll('[role="listitem"] > *');
 
         await host.click(linkDefinitionItems[2]);
-        await host.snapshot();
+        await host.snapshot('local');
 
         await host.sendTab();
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-link-definitions-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-link-definitions-1-snap.png b/__tests__/html2/citation/showModal.linkDefinitions.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-link-definitions-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-link-definitions-1-snap.png
rename to __tests__/html2/citation/showModal.linkDefinitions.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-link-definitions-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-link-definitions-2-snap.png b/__tests__/html2/citation/showModal.linkDefinitions.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-link-definitions-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-link-definitions-2-snap.png
rename to __tests__/html2/citation/showModal.linkDefinitions.html.snap-2.png
diff --git a/__tests__/html/citation.showModal.markdown.html b/__tests__/html2/citation/showModal.markdown.html
similarity index 96%
rename from __tests__/html/citation.showModal.markdown.html
rename to __tests__/html2/citation/showModal.markdown.html
index 487c4668d6..b8e72f773c 100644
--- a/__tests__/html/citation.showModal.markdown.html
+++ b/__tests__/html2/citation/showModal.markdown.html
@@ -47,10 +47,10 @@
 
         await host.click(markdownButtons[0]);
 
-        await host.snapshot();
+        await host.snapshot('local');
 
         await host.sendTab();
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-markdown-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-1-snap.png b/__tests__/html2/citation/showModal.markdown.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-markdown-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-1-snap.png
rename to __tests__/html2/citation/showModal.markdown.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-markdown-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-2-snap.png b/__tests__/html2/citation/showModal.markdown.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-markdown-js-citation-modal-dialog-should-show-when-clicking-on-citation-in-markdown-2-snap.png
rename to __tests__/html2/citation/showModal.markdown.html.snap-2.png
diff --git a/__tests__/html/citation.showModal.width.desktop.html b/__tests__/html2/citation/showModal.width.desktop.html
similarity index 96%
rename from __tests__/html/citation.showModal.width.desktop.html
rename to __tests__/html2/citation/showModal.width.desktop.html
index 3574cf9cc9..914c293eb4 100644
--- a/__tests__/html/citation.showModal.width.desktop.html
+++ b/__tests__/html2/citation/showModal.width.desktop.html
@@ -42,14 +42,14 @@
           type: 'message'
         });
 
-        await host.snapshot();
+        await host.snapshot('local');
 
         const markdownElement = pageElements.activities()[0].querySelector('.webchat__text-content__markdown');
         const markdownButtons = markdownElement.querySelectorAll('button');
 
         await host.click(markdownButtons[0]);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-1-snap.png b/__tests__/html2/citation/showModal.width.desktop.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-1-snap.png
rename to __tests__/html2/citation/showModal.width.desktop.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-2-snap.png b/__tests__/html2/citation/showModal.width.desktop.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-width-desktop-js-citation-modal-dialog-should-show-60-on-desktop-2-snap.png
rename to __tests__/html2/citation/showModal.width.desktop.html.snap-2.png
diff --git a/__tests__/html/citation.showModal.width.mobile.html b/__tests__/html2/citation/showModal.width.mobile.html
similarity index 96%
rename from __tests__/html/citation.showModal.width.mobile.html
rename to __tests__/html2/citation/showModal.width.mobile.html
index 17a14bc487..0e2edade51 100644
--- a/__tests__/html/citation.showModal.width.mobile.html
+++ b/__tests__/html2/citation/showModal.width.mobile.html
@@ -41,14 +41,14 @@
           type: 'message'
         });
 
-        await host.snapshot();
+        await host.snapshot('local');
 
         const markdownElement = pageElements.activities()[0].querySelector('.webchat__text-content__markdown');
         const markdownButtons = markdownElement.querySelectorAll('button');
 
         await host.click(markdownButtons[0]);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-width-mobile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-1-snap.png b/__tests__/html2/citation/showModal.width.mobile.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-width-mobile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-1-snap.png
rename to __tests__/html2/citation/showModal.width.mobile.html.snap-1.png
diff --git a/__tests__/__image_snapshots__/html/citation-show-modal-width-mobile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-2-snap.png b/__tests__/html2/citation/showModal.width.mobile.html.snap-2.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/citation-show-modal-width-mobile-js-citation-modal-dialog-should-show-full-width-on-mobile-device-2-snap.png
rename to __tests__/html2/citation/showModal.width.mobile.html.snap-2.png