diff --git a/packages/fieldset/test/lion-fieldset.test.js b/packages/fieldset/test/lion-fieldset.test.js
index bf552d73f..8ec5834a8 100644
--- a/packages/fieldset/test/lion-fieldset.test.js
+++ b/packages/fieldset/test/lion-fieldset.test.js
@@ -622,8 +622,7 @@ describe('<lion-fieldset>', () => {
       const spyB = sinon.spy(childB, 'initInteractionState');
       expect(fieldset.prefilled).to.be.false;
       expect(fieldset.dirty).to.be.false;
-      await fieldset.registrationReady;
-      await nextFrame();
+      await fieldset.registrationComplete;
       expect(spyA).to.have.been.called;
       expect(spyB).to.have.been.called;
       expect(fieldset.prefilled).to.be.true;
diff --git a/packages/form-core/src/validate/ValidateMixin.js b/packages/form-core/src/validate/ValidateMixin.js
index 56bd0516a..c3b39f6b0 100644
--- a/packages/form-core/src/validate/ValidateMixin.js
+++ b/packages/form-core/src/validate/ValidateMixin.js
@@ -544,6 +544,10 @@ export const ValidateMixin = dedupeMixin(
        * - we set aria-invalid="true" in case hasErrorVisible is true
        */
       _updateFeedbackComponent() {
+        if (!this._feedbackNode) {
+          return;
+        }
+
         if (!this.__feedbackQueue) {
           this.__feedbackQueue = new AsyncQueue();
         }
diff --git a/packages/overlays/src/OverlayController.js b/packages/overlays/src/OverlayController.js
index 02dbba656..6dd8e612a 100644
--- a/packages/overlays/src/OverlayController.js
+++ b/packages/overlays/src/OverlayController.js
@@ -517,7 +517,7 @@ export class OverlayController {
     const event = new CustomEvent('before-hide', { cancelable: true });
     this.dispatchEvent(event);
     if (!event.defaultPrevented) {
-      // await this.transitionHide({ backdropNode: this.backdropNode, conentNode: this.contentNode });
+      // await this.transitionHide({ backdropNode: this.backdropNode, contentNode: this.contentNode });
       this._contentWrapperNode.style.display = 'none';
       this._handleFeatures({ phase: 'hide' });
       this._keepBodySize({ phase: 'hide' });
diff --git a/packages/overlays/test-suites/OverlayMixin.suite.js b/packages/overlays/test-suites/OverlayMixin.suite.js
index db165174a..1d4bdd7c5 100644
--- a/packages/overlays/test-suites/OverlayMixin.suite.js
+++ b/packages/overlays/test-suites/OverlayMixin.suite.js
@@ -30,11 +30,16 @@ export function runOverlayMixinSuite({ tagString, tag, suffix = '' }) {
       `);
       el.opened = true;
       expect(el.opened).to.be.true;
+      await el.updateComplete;
+      if (el.repositionComplete) {
+        await el.repositionComplete;
+      }
       await nextFrame(); // overlayCtrl show/hide is async
       expect(el._overlayCtrl.isShown).to.be.true;
 
       el.opened = false;
       expect(el.opened).to.be.false;
+      await el.updateComplete;
       await nextFrame(); // overlayCtrl show/hide is async
       expect(el._overlayCtrl.isShown).to.be.false;
     });
diff --git a/web-test-runner.config.mjs b/web-test-runner.config.mjs
index e78fa8cd6..5b2055e0b 100644
--- a/web-test-runner.config.mjs
+++ b/web-test-runner.config.mjs
@@ -1,4 +1,5 @@
 export default {
+  sessionStartTimeout: 30000,
   coverage: process.argv.includes('--coverage')
     ? {
         thresholds: {
diff --git a/yarn.lock b/yarn.lock
index 8f382fa82..efc57fcb3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2513,20 +2513,6 @@
     mocha "^6.2.2"
     sinon-chai "^3.3.0"
 
-"@polymer/iron-test-helpers@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@polymer/iron-test-helpers/-/iron-test-helpers-3.0.1.tgz#ec2b9c6567e2967a191b3d800a04b1167b2d1394"
-  integrity sha512-2R7dnGcW2eg95i7LhYWWUO4AlAk6qXsPnKoyeN2R1t0km0ECMx0jjwqeLwCo8/7LwuVPZSiarI4DK7jyU7fJLQ==
-  dependencies:
-    "@polymer/polymer" "^3.0.0"
-
-"@polymer/polymer@^3.0.0":
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/@polymer/polymer/-/polymer-3.4.1.tgz#333bef25711f8411bb5624fb3eba8212ef8bee96"
-  integrity sha512-KPWnhDZibtqKrUz7enIPOiO4ZQoJNOuLwqrhV2MXzIt3VVnUVJVG5ORz4Z2sgO+UZ+/UZnPD0jqY+jmw/+a9mQ==
-  dependencies:
-    "@webcomponents/shadycss" "^1.9.1"
-
 "@reach/router@^1.2.1":
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz#d2574b19370a70c80480ed91f3da840136d10f8c"
@@ -3248,7 +3234,7 @@
     "@web/test-runner-mocha" "^0.1.2"
     command-line-args "^5.1.1"
 
-"@webcomponents/shadycss@^1.9.1", "@webcomponents/shadycss@^1.9.4":
+"@webcomponents/shadycss@^1.9.4":
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.10.0.tgz#7a80ec1e8b271fb3f0cc02cd4358b877a303545d"
   integrity sha512-UMS+dF4DXDrcUmQqK6aLd/3mFyfGktKG/hZR6FtrsQK/INO07G0H8FxElLkuvHj0iePeZGpR7R4lWFTvX7rc9g==