diff --git a/packages/botbuilder-adapter-facebook/src/botworker.ts b/packages/botbuilder-adapter-facebook/src/botworker.ts
index f9d9322ed..d3e04dfc3 100644
--- a/packages/botbuilder-adapter-facebook/src/botworker.ts
+++ b/packages/botbuilder-adapter-facebook/src/botworker.ts
@@ -68,7 +68,7 @@ export class FacebookBotWorker extends BotWorker {
      * @param userId the PSID of a user the bot has previously interacted with
      */
     public async startConversationWithUser(userId): Promise<void> {
-        return this.changeContext({
+        await this.changeContext({
             channelId: 'facebook',
             // @ts-ignore
             conversation: { id: userId },
diff --git a/packages/testbot/bot.js b/packages/testbot/bot.js
index 1e47152e3..6d6dda96e 100644
--- a/packages/testbot/bot.js
+++ b/packages/testbot/bot.js
@@ -145,12 +145,12 @@ const controller = new Botkit({
     webhook_uri: '/api/messages',
     webserver_middlewares: [(req, res, next) => { console.log('REQ > ', req.url); next(); }],
     // disable_console: true,
-    adapter: adapter,
+    // adapter: adapter,
     // disable_webserver: true,
-    // adapterConfig: {
-    //     appId: process.env.APP_ID,
-    //     appPassword: process.env.APP_PASSWORD
-    // },
+    adapterConfig: {
+        appId: process.env.APP_ID,
+        appPassword: process.env.APP_PASSWORD
+    },
     storage
 });
 
diff --git a/packages/testbot/features/teams_features.js b/packages/testbot/features/teams_features.js
index 6d021b55f..a1cb20a14 100644
--- a/packages/testbot/features/teams_features.js
+++ b/packages/testbot/features/teams_features.js
@@ -1,9 +1,11 @@
-const request = require('request');
+const { TeamsInvokeMiddleware } = require('botkit');
 
 module.exports = function(controller) {
 
     if (!controller.adapter.name) {
 
+      controller.adapter.use(new TeamsInvokeMiddleware());
+
       const adaptiveCard = {
         "type": "AdaptiveCard",
         "body": [