diff --git a/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js b/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js
index 7f204beb..39c33491 100644
--- a/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js
+++ b/docs/src/demos/Examples/MarkdownShortcuts/index.spec.js
@@ -1,12 +1,9 @@
 context('/examples/markdown-shortcuts', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/examples/markdown-shortcuts')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.clearContent()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Blockquote/index.spec.js b/docs/src/demos/Extensions/Blockquote/index.spec.js
index 3fe8009d..798ad8fd 100644
--- a/docs/src/demos/Extensions/Blockquote/index.spec.js
+++ b/docs/src/demos/Extensions/Blockquote/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/blockquote', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/blockquote')
-  })
-
-  beforeEach((done) => {
+    
     cy.get('.ProseMirror').then(([{ editor }]) => {
       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 b2048443..f45f1583 100644
--- a/docs/src/demos/Extensions/Bold/index.spec.js
+++ b/docs/src/demos/Extensions/Bold/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/bold', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/bold')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })
 
@@ -36,7 +33,8 @@ context('/api/extensions/bold', () => {
 
     cy.get('.ProseMirror')
       .type('{meta}b', { force: true })
-      .should('not.exist')
+
+    cy.get('.ProseMirror strong').should('not.exist')
   })
 
   it('should make a bold text from the default markdown shortcut', () => {
diff --git a/docs/src/demos/Extensions/Code/index.spec.js b/docs/src/demos/Extensions/Code/index.spec.js
index 0655bb65..e801b308 100644
--- a/docs/src/demos/Extensions/Code/index.spec.js
+++ b/docs/src/demos/Extensions/Code/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/code', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/code')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       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 17ec012a..e91dae04 100644
--- a/docs/src/demos/Extensions/CodeBlock/index.spec.js
+++ b/docs/src/demos/Extensions/CodeBlock/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/code-block', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/code-block')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       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 016e34d1..971f6a98 100644
--- a/docs/src/demos/Extensions/HardBreak/index.spec.js
+++ b/docs/src/demos/Extensions/HardBreak/index.spec.js
@@ -1,9 +1,7 @@
 context('/api/extensions/hard-break', () => {
-  before(() => {
-    cy.visit('/api/extensions/hard-break')
-  })
-
   beforeEach(() => {
+    cy.visit('/api/extensions/hard-break')
+
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.setContent('<p>Example Text</p>')
     })
diff --git a/docs/src/demos/Extensions/Heading/index.spec.js b/docs/src/demos/Extensions/Heading/index.spec.js
index 4fce5328..61728784 100644
--- a/docs/src/demos/Extensions/Heading/index.spec.js
+++ b/docs/src/demos/Extensions/Heading/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/heading', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/heading')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       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 43dc7e47..2d0e494d 100644
--- a/docs/src/demos/Extensions/History/index.spec.js
+++ b/docs/src/demos/Extensions/History/index.spec.js
@@ -1,9 +1,7 @@
 context('/api/extensions/history', () => {
-  before(() => {
-    cy.visit('/api/extensions/history')
-  })
-
   beforeEach(() => {
+    cy.visit('/api/extensions/history')
+
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.setContent('<p>Mistake</p>')
     })
diff --git a/docs/src/demos/Extensions/HorizontalRule/index.spec.js b/docs/src/demos/Extensions/HorizontalRule/index.spec.js
index 75b8f105..30d0373c 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').then(([{ editor }]) => {
       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 54033d22..448b1154 100644
--- a/docs/src/demos/Extensions/Italic/index.spec.js
+++ b/docs/src/demos/Extensions/Italic/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/italic', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/italic')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       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 934b14c1..299e1945 100644
--- a/docs/src/demos/Extensions/Paragraph/index.spec.js
+++ b/docs/src/demos/Extensions/Paragraph/index.spec.js
@@ -1,12 +1,9 @@
 context('/api/extensions/paragraph', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/paragraph')
-  })
-
-  beforeEach((done) => {
+    
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.clearContent()
-      done()
     })
   })
 
diff --git a/docs/src/demos/Extensions/Strike/index.spec.js b/docs/src/demos/Extensions/Strike/index.spec.js
index 7e1e53fa..05eaac51 100644
--- a/docs/src/demos/Extensions/Strike/index.spec.js
+++ b/docs/src/demos/Extensions/Strike/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/strike', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/strike')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       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 096e71be..20537de6 100644
--- a/docs/src/demos/Extensions/Underline/index.spec.js
+++ b/docs/src/demos/Extensions/Underline/index.spec.js
@@ -1,13 +1,10 @@
 context('/api/extensions/underline', () => {
-  before(() => {
+  beforeEach(() => {
     cy.visit('/api/extensions/underline')
-  })
 
-  beforeEach((done) => {
     cy.get('.ProseMirror').then(([{ editor }]) => {
       editor.setContent('<p>Example Text</p>')
       editor.selectAll()
-      done()
     })
   })