diff --git a/__tests__/html/conversationStartProperties.noLocaleIsSent.js b/__tests__/html/conversationStartProperties.noLocaleIsSent.js
deleted file mode 100644
index 1e7e06a046..0000000000
--- a/__tests__/html/conversationStartProperties.noLocaleIsSent.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('conversationStartProperties', () => {
-  test('with no locale is sent should get "Hello and welcome!" message.', () =>
-    runHTML('conversationStartProperties.noLocaleIsSent.html'));
-});
diff --git a/__tests__/html/conversationStartProperties.sendEnUs.js b/__tests__/html/conversationStartProperties.sendEnUs.js
deleted file mode 100644
index 86b4e63f06..0000000000
--- a/__tests__/html/conversationStartProperties.sendEnUs.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('conversationStartProperties', () => {
-  test('with locale of en-US should get "Hello and welcome!" message.', () =>
-    runHTML('conversationStartProperties.sendEnUs.html'));
-});
diff --git a/__tests__/html/conversationStartProperties.sendInvalidType.js b/__tests__/html/conversationStartProperties.sendInvalidType.js
deleted file mode 100644
index a2f8e78695..0000000000
--- a/__tests__/html/conversationStartProperties.sendInvalidType.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('conversationStartProperties', () => {
-  test('with locale of invalid type should get "Hello and welcome!" message.', () =>
-    runHTML('conversationStartProperties.sendInvalidType.html'));
-});
diff --git a/__tests__/html/conversationStartProperties.sendNonExisting.js b/__tests__/html/conversationStartProperties.sendNonExisting.js
deleted file mode 100644
index 04f66362b0..0000000000
--- a/__tests__/html/conversationStartProperties.sendNonExisting.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('conversationStartProperties', () => {
-  test('with non-existing locale should get "Hello and welcome!" message.', () =>
-    runHTML('conversationStartProperties.sendNonExisting.html'));
-});
diff --git a/__tests__/html/conversationStartProperties.sendNonISOFormat.js b/__tests__/html/conversationStartProperties.sendNonISOFormat.js
deleted file mode 100644
index 928f801443..0000000000
--- a/__tests__/html/conversationStartProperties.sendNonISOFormat.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('conversationStartProperties', () => {
-  test('with non ISO format locale should get "Hello and welcome!" message.', () =>
-    runHTML('conversationStartProperties.sendNonISOFormat.html'));
-});
diff --git a/__tests__/html/conversationStartProperties.sendZhCn.js b/__tests__/html/conversationStartProperties.sendZhCn.js
deleted file mode 100644
index b95f981c20..0000000000
--- a/__tests__/html/conversationStartProperties.sendZhCn.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('conversationStartProperties', () => {
-  test('with locale of zh-CN should get "Hello and welcome!" in Simplified Chinese.', () =>
-    runHTML('conversationStartProperties.sendZhCn.html'));
-});
diff --git a/__tests__/html/directLine.postActivity.localTimezone.js b/__tests__/html/directLine.postActivity.localTimezone.js
deleted file mode 100644
index a823195e61..0000000000
--- a/__tests__/html/directLine.postActivity.localTimezone.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('postActivity', () => {
-  test('should send localTimestamp and localTimezone', () => runHTML('directLine.postActivity.localTimezone.html'));
-});
diff --git a/__tests__/html/directLine.postActivity.localTimezone.noIntl.js b/__tests__/html/directLine.postActivity.localTimezone.noIntl.js
deleted file mode 100644
index 37a1784258..0000000000
--- a/__tests__/html/directLine.postActivity.localTimezone.noIntl.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('postActivity', () => {
-  test('should send localTimestamp only if Intl global is undefined', () => runHTML('directLine.postActivity.localTimezone.noIntl.html'));
-});
diff --git a/__tests__/html/directLine.setUserId.js b/__tests__/html/directLine.setUserId.js
deleted file mode 100644
index 1aabc42f53..0000000000
--- a/__tests__/html/directLine.setUserId.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @jest-environment ./packages/test/harness/src/host/jest/WebDriverEnvironment.js */
-
-describe('DirectLine', () => {
-  test('should set user ID if setUserID function is provided', () => runHTML('directLine.setUserId.html'));
-});
diff --git a/__tests__/html/conversationStartProperties.noLocaleIsSent.html b/__tests__/html2/conversationStartProperties/noLocaleIsSent.html
similarity index 96%
rename from __tests__/html/conversationStartProperties.noLocaleIsSent.html
rename to __tests__/html2/conversationStartProperties/noLocaleIsSent.html
index b673b24242..312ae49b52 100644
--- a/__tests__/html/conversationStartProperties.noLocaleIsSent.html
+++ b/__tests__/html2/conversationStartProperties/noLocaleIsSent.html
@@ -26,7 +26,7 @@
         await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/conversation-start-properties-no-locale-is-sent-js-conversation-start-properties-with-no-locale-is-sent-should-get-hello-and-welcome-message-1-snap.png b/__tests__/html2/conversationStartProperties/noLocaleIsSent.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/conversation-start-properties-no-locale-is-sent-js-conversation-start-properties-with-no-locale-is-sent-should-get-hello-and-welcome-message-1-snap.png
rename to __tests__/html2/conversationStartProperties/noLocaleIsSent.html.snap-1.png
diff --git a/__tests__/html/conversationStartProperties.sendEnUs.html b/__tests__/html2/conversationStartProperties/sendEnUs.html
similarity index 96%
rename from __tests__/html/conversationStartProperties.sendEnUs.html
rename to __tests__/html2/conversationStartProperties/sendEnUs.html
index 74821374f9..a99cfd4bb0 100644
--- a/__tests__/html/conversationStartProperties.sendEnUs.html
+++ b/__tests__/html2/conversationStartProperties/sendEnUs.html
@@ -29,7 +29,7 @@
         await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/conversation-start-properties-send-en-us-js-conversation-start-properties-with-locale-of-en-us-should-get-hello-and-welcome-message-1-snap.png b/__tests__/html2/conversationStartProperties/sendEnUs.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/conversation-start-properties-send-en-us-js-conversation-start-properties-with-locale-of-en-us-should-get-hello-and-welcome-message-1-snap.png
rename to __tests__/html2/conversationStartProperties/sendEnUs.html.snap-1.png
diff --git a/__tests__/html/conversationStartProperties.sendInvalidType.html b/__tests__/html2/conversationStartProperties/sendInvalidType.html
similarity index 96%
rename from __tests__/html/conversationStartProperties.sendInvalidType.html
rename to __tests__/html2/conversationStartProperties/sendInvalidType.html
index 4dceace762..2567552a38 100644
--- a/__tests__/html/conversationStartProperties.sendInvalidType.html
+++ b/__tests__/html2/conversationStartProperties/sendInvalidType.html
@@ -29,7 +29,7 @@
         await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/conversation-start-properties-send-invalid-type-js-conversation-start-properties-with-locale-of-invalid-type-should-get-hello-and-welcome-message-1-snap.png b/__tests__/html2/conversationStartProperties/sendInvalidType.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/conversation-start-properties-send-invalid-type-js-conversation-start-properties-with-locale-of-invalid-type-should-get-hello-and-welcome-message-1-snap.png
rename to __tests__/html2/conversationStartProperties/sendInvalidType.html.snap-1.png
diff --git a/__tests__/html/conversationStartProperties.sendNonExisting.html b/__tests__/html2/conversationStartProperties/sendNonExisting.html
similarity index 96%
rename from __tests__/html/conversationStartProperties.sendNonExisting.html
rename to __tests__/html2/conversationStartProperties/sendNonExisting.html
index 84d28b24ea..fc67319efe 100644
--- a/__tests__/html/conversationStartProperties.sendNonExisting.html
+++ b/__tests__/html2/conversationStartProperties/sendNonExisting.html
@@ -29,7 +29,7 @@
         await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/conversation-start-properties-send-non-existing-js-conversation-start-properties-with-non-existing-locale-should-get-hello-and-welcome-message-1-snap.png b/__tests__/html2/conversationStartProperties/sendNonExisting.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/conversation-start-properties-send-non-existing-js-conversation-start-properties-with-non-existing-locale-should-get-hello-and-welcome-message-1-snap.png
rename to __tests__/html2/conversationStartProperties/sendNonExisting.html.snap-1.png
diff --git a/__tests__/html/conversationStartProperties.sendNonISOFormat.html b/__tests__/html2/conversationStartProperties/sendNonISOFormat.html
similarity index 96%
rename from __tests__/html/conversationStartProperties.sendNonISOFormat.html
rename to __tests__/html2/conversationStartProperties/sendNonISOFormat.html
index edab8d154c..34d9c9d336 100644
--- a/__tests__/html/conversationStartProperties.sendNonISOFormat.html
+++ b/__tests__/html2/conversationStartProperties/sendNonISOFormat.html
@@ -29,7 +29,7 @@
         await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/conversation-start-properties-send-non-iso-format-js-conversation-start-properties-with-non-iso-format-locale-should-get-hello-and-welcome-message-1-snap.png b/__tests__/html2/conversationStartProperties/sendNonISOFormat.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/conversation-start-properties-send-non-iso-format-js-conversation-start-properties-with-non-iso-format-locale-should-get-hello-and-welcome-message-1-snap.png
rename to __tests__/html2/conversationStartProperties/sendNonISOFormat.html.snap-1.png
diff --git a/__tests__/html/conversationStartProperties.sendZhCn.html b/__tests__/html2/conversationStartProperties/sendZhCn.html
similarity index 96%
rename from __tests__/html/conversationStartProperties.sendZhCn.html
rename to __tests__/html2/conversationStartProperties/sendZhCn.html
index 7cbcc79306..866f59a2dc 100644
--- a/__tests__/html/conversationStartProperties.sendZhCn.html
+++ b/__tests__/html2/conversationStartProperties/sendZhCn.html
@@ -29,7 +29,7 @@
         await pageObjects.sendMessageViaSendBox('conversationstart');
         await pageConditions.minNumActivitiesShown(2);
 
-        await host.snapshot();
+        await host.snapshot('local');
       });
     </script>
   </body>
diff --git a/__tests__/__image_snapshots__/html/conversation-start-properties-send-zh-cn-js-conversation-start-properties-with-locale-of-zh-cn-should-get-hello-and-welcome-in-simplified-chinese-1-snap.png b/__tests__/html2/conversationStartProperties/sendZhCn.html.snap-1.png
similarity index 100%
rename from __tests__/__image_snapshots__/html/conversation-start-properties-send-zh-cn-js-conversation-start-properties-with-locale-of-zh-cn-should-get-hello-and-welcome-in-simplified-chinese-1-snap.png
rename to __tests__/html2/conversationStartProperties/sendZhCn.html.snap-1.png
diff --git a/__tests__/html/directLine.postActivity.localTimezone.html b/__tests__/html2/directLine/postActivity.localTimezone.html
similarity index 100%
rename from __tests__/html/directLine.postActivity.localTimezone.html
rename to __tests__/html2/directLine/postActivity.localTimezone.html
diff --git a/__tests__/html/directLine.postActivity.localTimezone.noIntl.html b/__tests__/html2/directLine/postActivity.localTimezone.noIntl.html
similarity index 100%
rename from __tests__/html/directLine.postActivity.localTimezone.noIntl.html
rename to __tests__/html2/directLine/postActivity.localTimezone.noIntl.html
diff --git a/__tests__/html/directLine.setUserId.html b/__tests__/html2/directLine/setUserId.html
similarity index 100%
rename from __tests__/html/directLine.setUserId.html
rename to __tests__/html2/directLine/setUserId.html