diff --git a/test/graph/mail-messages.ts b/test/graph/mail-messages.ts
index 50b69b161..f1712a668 100644
--- a/test/graph/mail-messages.ts
+++ b/test/graph/mail-messages.ts
@@ -146,7 +146,9 @@ describe("Mail: Messages", function () {
         return expect(success).to.be.true;
     });
 
-    it("Mail: Send Draft Message", async function () {
+    // Do not test sending draft message
+
+    it.skip("Mail: Send Draft Message", async function () {
         const m = JSON.parse(JSON.stringify(draftMessage));
         m.subject = `PnPjs Test Message ${getRandomString(8)}`;
         const draft = await user.messages.add(m);
diff --git a/test/sp/clientside-pages.ts b/test/sp/clientside-pages.ts
index 7d6734f57..6ee9ef335 100644
--- a/test/sp/clientside-pages.ts
+++ b/test/sp/clientside-pages.ts
@@ -380,6 +380,10 @@ describe("Clientside Pages", function () {
 
         it("setAuthorByLoginName()", pnpTest("8eb5897e-8b43-45ba-acbc-468495e189fe", async function () {
 
+            if (stringIsNullOrEmpty(this.pnp.settings.testUser)) {
+                this.skip();
+            }
+
             await page.setAuthorByLoginName(this.pnp.settings.testUser);
             await page.save();
 
diff --git a/test/sp/sharing.ts b/test/sp/sharing.ts
index deaea4ad6..74d68b910 100644
--- a/test/sp/sharing.ts
+++ b/test/sp/sharing.ts
@@ -70,18 +70,14 @@ describe("Sharing", function () {
                 .and.have.deep.property("Url").that.is.not.null;
         });
 
-        it("getShareLink (AnonymousView)", function () {
-            return expect(folder.getShareLink(SharingLinkKind.AnonymousView))
-                .to.eventually.be.fulfilled
-                .and.have.property("sharingLinkInfo")
-                .and.have.deep.property("Url").that.is.not.null;
+        it("getShareLink (AnonymousView)", async function () {
+            const sharing = await folder.getShareLink(SharingLinkKind.AnonymousView);
+            return expect(sharing).to.have.property("sharingLinkInfo").and.have.deep.property("Url").that.is.not.null;
         });
 
-        it("getShareLink (ExpirationDate)", function () {
-            return expect(folder.getShareLink(SharingLinkKind.AnonymousView, dateAdd(new Date(), "day", 5)))
-                .to.eventually.be.fulfilled
-                .and.have.property("sharingLinkInfo")
-                .and.have.deep.property("Url").that.is.not.null;
+        it("getShareLink (ExpirationDate)", async function () {
+            const sharing = await folder.getShareLink(SharingLinkKind.AnonymousView, dateAdd(new Date(), "day", 5));
+            return expect(sharing).to.have.property("sharingLinkInfo").and.have.deep.property("Url").that.is.not.null;
         });
 
         it(".shareWith (Edit)", function () {
@@ -235,18 +231,14 @@ describe("Sharing", function () {
                 .and.have.deep.property("Url").that.is.not.null;
         });
 
-        it("getShareLink (AnonymousView)", function () {
-            return expect(item.getShareLink(SharingLinkKind.AnonymousView))
-                .to.eventually.be.fulfilled
-                .and.have.property("sharingLinkInfo")
-                .and.have.deep.property("Url").that.is.not.null;
+        it("getShareLink (AnonymousView)", async function () {
+            const sharing = await item.getShareLink(SharingLinkKind.AnonymousView);
+            return expect(sharing).to.have.property("sharingLinkInfo").and.have.deep.property("Url").that.is.not.null;
         });
 
-        it("getShareLink (ExpirationDate)", function () {
-            return expect(item.getShareLink(SharingLinkKind.AnonymousView, dateAdd(new Date(), "day", 5)))
-                .to.eventually.be.fulfilled
-                .and.have.property("sharingLinkInfo")
-                .and.have.deep.property("Url").that.is.not.null;
+        it("getShareLink (ExpirationDate)", async function () {
+            const sharing = await item.getShareLink(SharingLinkKind.AnonymousView, dateAdd(new Date(), "day", 5));
+            return expect(sharing).to.have.property("sharingLinkInfo").and.have.deep.property("Url").that.is.not.null;
         });
 
         it(".shareWith (Edit)", async function () {