diff --git a/packages/Teams/js/src/adaptiveTeamsBotComponent.ts b/packages/Teams/js/src/adaptiveTeamsBotComponent.ts
index 37f6e4b9b9..85f800e0ab 100644
--- a/packages/Teams/js/src/adaptiveTeamsBotComponent.ts
+++ b/packages/Teams/js/src/adaptiveTeamsBotComponent.ts
@@ -48,7 +48,6 @@ import {
   OnTeamsMECardButtonClicked,
   OnTeamsMEConfigQuerySettingUrl,
   OnTeamsMEConfigSetting,
-  OnTeamsMEConfigurationSetting,
   OnTeamsMEFetchTask,
   OnTeamsMEQuery,
   OnTeamsMESelectItem,
@@ -185,10 +184,6 @@ export class AdaptiveTeamsBotComponent extends BotComponent {
               { kind: OnTeamsMEFetchTask.$kind, type: OnTeamsMEFetchTask },
               { kind: OnTeamsMEQuery.$kind, type: OnTeamsMEQuery },
               { kind: OnTeamsMESelectItem.$kind, type: OnTeamsMESelectItem },
-              {
-                kind: OnTeamsMEConfigurationSetting.$kind,
-                type: OnTeamsMEConfigurationSetting,
-              },
               {
                 kind: OnTeamsMESubmitAction.$kind,
                 type: OnTeamsMESubmitAction,
diff --git a/packages/Teams/js/src/conditions/onTeamsMEBotMessagePreviewSend.ts b/packages/Teams/js/src/conditions/onTeamsMEBotMessagePreviewSend.ts
index bc21decd69..1675f3aadd 100644
--- a/packages/Teams/js/src/conditions/onTeamsMEBotMessagePreviewSend.ts
+++ b/packages/Teams/js/src/conditions/onTeamsMEBotMessagePreviewSend.ts
@@ -11,7 +11,7 @@ import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive';
  * and activity.value.botMessagePreviewAction == 'send'.
  */
 export class OnTeamsMEBotMessagePreviewSend extends OnInvokeActivity {
-  static $kind = 'Teams.OnMEBotMessagePreviewEdit';
+  static $kind = 'Teams.OnMEBotMessagePreviewSend';
 
   public commandId?: string;
 
diff --git a/packages/Teams/js/src/conditions/onTeamsMEConfigurationSetting.ts b/packages/Teams/js/src/conditions/onTeamsMEConfigurationSetting.ts
deleted file mode 100644
index 5987339a07..0000000000
--- a/packages/Teams/js/src/conditions/onTeamsMEConfigurationSetting.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-import { Expression } from 'adaptive-expressions';
-import { Channels } from 'botbuilder';
-import { TurnPath } from 'botbuilder-dialogs';
-import { OnInvokeActivity } from 'botbuilder-dialogs-adaptive';
-
-/**
- * Actions triggered when a Teams InvokeActivity is received with activity.name='composeExtension/setting'.
- */
-export class OnTeamsMEConfigurationSetting extends OnInvokeActivity {
-  static $kind = 'Teams.OnMEConfigurationSetting';
-
-  /**
-   * Create expression for this condition.
-   *
-   * @returns {Expression} An [Expression](xref:adaptive-expressions.Expression) used to evaluate this rule.
-   */
-  protected createExpression(): Expression {
-    return Expression.andExpression(
-      Expression.parse(
-        `${TurnPath.activity}.channelId == '${Channels.Msteams}' && ${TurnPath.activity}.name == 'composeExtension/setting'`
-      ),
-      super.createExpression()
-    );
-  }
-}
diff --git a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj b/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj
deleted file mode 100644
index f19031a408..0000000000
--- a/tests/unit/packages/Microsoft.Bot.Components.Teams.Tests/Microsoft.Bot.Components.Teams.Tests.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework Condition="'$(BuildTarget)' == 'netcoreapp21'">netcoreapp2.1</TargetFramework>
-    <TargetFramework Condition="'$(BuildTarget)' == 'netcoreapp31'">netcoreapp3.1</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildTarget)' == ''">netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
-    <IsPackable>false</IsPackable>
-    <Configurations>Debug;Release</Configurations>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Adaptive.Testing" Version="4.14.1-preview" />
-    <PackageReference Include="Microsoft.Bot.Builder.Dialogs.Declarative" Version="4.14.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\packages\Teams\dotnet\Microsoft.Bot.Components.Teams.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-</Project>
diff --git a/tests/unit/packages/Teams/Shared Tests/ConditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog b/tests/unit/packages/Teams/Shared Tests/ConditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog
index ef348c61ac..a4b7225a61 100644
--- a/tests/unit/packages/Teams/Shared Tests/ConditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog	
+++ b/tests/unit/packages/Teams/Shared Tests/ConditionalTests/ConditionalsTests_OnTeamsActivityTypes.test.dialog	
@@ -93,6 +93,26 @@
           }
         ]
       },
+      {
+        "$kind": "Teams.OnMEBotMessagePreviewEdit",
+        "condition": "turn.activity.text == 'OnMEBotMessagePreviewEdit'",
+        "actions": [
+          {
+            "$kind": "Microsoft.SendActivity",
+            "activity": "OnMEBotMessagePreviewEdit"
+          }
+        ]
+      },
+      {
+        "$kind": "Teams.OnMEBotMessagePreviewSend",
+        "condition": "turn.activity.text == 'OnMEBotMessagePreviewSend'",
+        "actions": [
+          {
+            "$kind": "Microsoft.SendActivity",
+            "activity": "OnMEBotMessagePreviewSend"
+          }
+        ]
+      },
       {
         "$kind": "Teams.OnMECardButtonClicked",
         "condition": "turn.activity.text == 'OnCardButtonClicked'",
@@ -372,6 +392,36 @@
       "$kind": "Microsoft.Test.AssertReply",
       "text": "OnFileConsent"
     },
+    {
+      "$kind": "Microsoft.Test.UserActivity",
+      "activity": {
+        "type": "invoke",
+        "text": "OnMEBotMessagePreviewEdit",
+        "value": {
+          "botMessagePreviewAction": "edit"
+        },
+        "name": "composeExtension/submitAction"
+      }
+    },
+    {
+      "$kind": "Microsoft.Test.AssertReply",
+      "text": "OnMEBotMessagePreviewEdit"
+    },
+    {
+      "$kind": "Microsoft.Test.UserActivity",
+      "activity": {
+        "type": "invoke",
+        "text": "OnMEBotMessagePreviewSend",
+        "value": {
+          "botMessagePreviewAction": "send"
+        },
+        "name": "composeExtension/submitAction"
+      }
+    },
+    {
+      "$kind": "Microsoft.Test.AssertReply",
+      "text": "OnMEBotMessagePreviewSend"
+    },
     {
       "$kind": "Microsoft.Test.UserActivity",
       "activity": {