diff --git a/jest.config.js b/jest.config.js
index efa93bc9b..2cc332539 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -39,9 +39,9 @@ module.exports = {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 19.5,
+      branches: 20,
       functions: 24,
-      lines: 29.5,
+      lines: 30,
       statements: 29.0
     }
   },
diff --git a/src/Common/DataAccessUtilityBase.ts b/src/Common/DataAccessUtilityBase.ts
index 6bbf03eb9..0486d4aa8 100644
--- a/src/Common/DataAccessUtilityBase.ts
+++ b/src/Common/DataAccessUtilityBase.ts
@@ -20,7 +20,7 @@ import { ContainerRequest } from "@azure/cosmos/dist-esm/client/Container/Contai
 import { CosmosClient } from "./CosmosClient";
 import { DatabaseRequest } from "@azure/cosmos/dist-esm/client/Database/DatabaseRequest";
 import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
-import { sendCachedDataMessage, canSendMessage } from "./MessageHandler";
+import { sendCachedDataMessage } from "./MessageHandler";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { OfferUtils } from "../Utils/OfferUtils";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
@@ -612,7 +612,7 @@ export function createDatabase(
 }
 
 export function refreshCachedOffers(): Q.Promise<void> {
-  if (canSendMessage()) {
+  if (config.platform === Platform.Portal) {
     return sendCachedDataMessage(MessageTypes.RefreshOffers, []);
   } else {
     return Q();
@@ -620,7 +620,7 @@ export function refreshCachedOffers(): Q.Promise<void> {
 }
 
 export function refreshCachedResources(options?: any): Q.Promise<void> {
-  if (canSendMessage()) {
+  if (config.platform === Platform.Portal) {
     return sendCachedDataMessage(MessageTypes.RefreshResources, []);
   } else {
     return Q();
diff --git a/src/Common/MessageHandler.ts b/src/Common/MessageHandler.ts
index f89ccf9ea..98b912d44 100644
--- a/src/Common/MessageHandler.ts
+++ b/src/Common/MessageHandler.ts
@@ -2,7 +2,6 @@ import { MessageTypes } from "../Contracts/ExplorerContracts";
 import Q from "q";
 import * as _ from "underscore";
 import * as Constants from "./Constants";
-import { config, Platform } from "../Config";
 
 export interface CachedDataPromise<T> {
   deferred: Q.Deferred<T>;
@@ -60,7 +59,7 @@ export function sendMessage(data: any): void {
 }
 
 export function canSendMessage(): boolean {
-  return config.platform === Platform.Portal && window.parent !== window;
+  return window.parent !== window;
 }
 
 // TODO: This is exported just for testing. It should not be.
diff --git a/src/Common/dataAccess/deleteCollection.test.ts b/src/Common/dataAccess/deleteCollection.test.ts
index 7bb5d3ec5..d5e578208 100644
--- a/src/Common/dataAccess/deleteCollection.test.ts
+++ b/src/Common/dataAccess/deleteCollection.test.ts
@@ -1,11 +1,14 @@
 jest.mock("../../Utils/arm/request");
+jest.mock("../MessageHandler");
 import { deleteCollection } from "./deleteCollection";
 import { armRequest } from "../../Utils/arm/request";
 import { AuthType } from "../../AuthType";
+import { sendCachedDataMessage } from "../MessageHandler";
 
 describe("deleteCollection", () => {
   it("should call ARM if logged in with AAD", async () => {
     window.authType = AuthType.AAD;
+    (sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
     await deleteCollection("database", "collection");
     expect(armRequest).toHaveBeenCalled();
   });
diff --git a/src/Common/dataAccess/deleteDatabase.test.ts b/src/Common/dataAccess/deleteDatabase.test.ts
index 89ec0688f..e8793ac03 100644
--- a/src/Common/dataAccess/deleteDatabase.test.ts
+++ b/src/Common/dataAccess/deleteDatabase.test.ts
@@ -1,11 +1,14 @@
 jest.mock("../../Utils/arm/request");
+jest.mock("../MessageHandler");
 import { deleteDatabase } from "./deleteDatabase";
 import { armRequest } from "../../Utils/arm/request";
 import { AuthType } from "../../AuthType";
+import { sendCachedDataMessage } from "../MessageHandler";
 
 describe("deleteDatabase", () => {
   it("should call ARM if logged in with AAD", async () => {
     window.authType = AuthType.AAD;
+    (sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
     await deleteDatabase("database");
     expect(armRequest).toHaveBeenCalled();
   });