diff --git a/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js b/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js
index e97f398c..625b2387 100644
--- a/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js
+++ b/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js
@@ -1,13 +1,10 @@
 context('/examples/markdown-shortcuts', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/examples/markdown-shortcuts')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.clearContent()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Blockquote/index.spec.js b/docs/src/demos/Extensions/Blockquote/index.spec.js
index 4a6f3ee5..aac442e8 100644
--- a/docs/src/demos/Extensions/Blockquote/index.spec.js
+++ b/docs/src/demos/Extensions/Blockquote/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/blockquote', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/blockquote')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Bold/index.spec.js b/docs/src/demos/Extensions/Bold/index.spec.js
index 98ac79a2..05c5ec0c 100644
--- a/docs/src/demos/Extensions/Bold/index.spec.js
+++ b/docs/src/demos/Extensions/Bold/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/bold', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/bold')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
@@ -36,6 +33,7 @@ context('/api/extensions/bold', () => {
       .contains('strong', 'Example Text')
 
     cy.get('.ProseMirror')
+      .type('{selectall}', { force: true })
       .type('{meta}b', { force: true })
       .should('not.exist')
   })
diff --git a/docs/src/demos/Extensions/Code/index.spec.js b/docs/src/demos/Extensions/Code/index.spec.js
index f10f9b02..78d16ed6 100644
--- a/docs/src/demos/Extensions/Code/index.spec.js
+++ b/docs/src/demos/Extensions/Code/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/code', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/code')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/CodeBlock/index.spec.js b/docs/src/demos/Extensions/CodeBlock/index.spec.js
index e3321905..7a669fd9 100644
--- a/docs/src/demos/Extensions/CodeBlock/index.spec.js
+++ b/docs/src/demos/Extensions/CodeBlock/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/code-block', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/code-block')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/HardBreak/index.spec.js b/docs/src/demos/Extensions/HardBreak/index.spec.js
index 43439c24..f0bb8319 100644
--- a/docs/src/demos/Extensions/HardBreak/index.spec.js
+++ b/docs/src/demos/Extensions/HardBreak/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/hard-break', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/hard-break')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Heading/index.spec.js b/docs/src/demos/Extensions/Heading/index.spec.js
index aa6aeecc..0b454f5a 100644
--- a/docs/src/demos/Extensions/Heading/index.spec.js
+++ b/docs/src/demos/Extensions/Heading/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/heading', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/heading')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/History/index.spec.js b/docs/src/demos/Extensions/History/index.spec.js
index 98600bb6..5dae19f5 100644
--- a/docs/src/demos/Extensions/History/index.spec.js
+++ b/docs/src/demos/Extensions/History/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/history', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/history')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Mistake</p>')
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/HorizontalRule/index.spec.js b/docs/src/demos/Extensions/HorizontalRule/index.spec.js
index 41163de2..861280f8 100644
--- a/docs/src/demos/Extensions/HorizontalRule/index.spec.js
+++ b/docs/src/demos/Extensions/HorizontalRule/index.spec.js
@@ -1,9 +1,7 @@
 context('/api/extensions/horizontal-rule', () => {
-  before(() => {
-    cy.visit('/api/extensions/horizontal-rule')
-  })
-
   beforeEach(() => {
+    cy.visit('/api/extensions/horizontal-rule')
+
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
diff --git a/docs/src/demos/Extensions/Italic/index.spec.js b/docs/src/demos/Extensions/Italic/index.spec.js
index c29cb392..4c36abb7 100644
--- a/docs/src/demos/Extensions/Italic/index.spec.js
+++ b/docs/src/demos/Extensions/Italic/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/italic', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/italic')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Paragraph/index.spec.js b/docs/src/demos/Extensions/Paragraph/index.spec.js
index f1ab8688..1ae53894 100644
--- a/docs/src/demos/Extensions/Paragraph/index.spec.js
+++ b/docs/src/demos/Extensions/Paragraph/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/paragraph', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/paragraph')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.clearContent()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Strike/index.spec.js b/docs/src/demos/Extensions/Strike/index.spec.js
index c1d80daf..99156659 100644
--- a/docs/src/demos/Extensions/Strike/index.spec.js
+++ b/docs/src/demos/Extensions/Strike/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/strike', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/strike')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Underline/index.spec.js b/docs/src/demos/Extensions/Underline/index.spec.js
index 4e26ca91..c170dbe9 100644
--- a/docs/src/demos/Extensions/Underline/index.spec.js
+++ b/docs/src/demos/Extensions/Underline/index.spec.js
@@ -1,14 +1,11 @@
 context('/api/extensions/underline', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/underline')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').window().then(window => {
       const { editor } = window
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })