diff --git a/test/busboy-constructor.test.js b/test/busboy-constructor.test.js
index b2ef43b..8607789 100644
--- a/test/busboy-constructor.test.js
+++ b/test/busboy-constructor.test.js
@@ -3,77 +3,73 @@
 const Busboy = require('../lib/main')
 const { test } = require('tap')
 
-test('busboy-constructor', t => {
-  t.plan(11)
+test('busboy-constructor - should throw an Error if no options are provided', t => {
+  t.plan(1)
 
-  t.test('should throw an Error if no options are provided', t => {
-    t.plan(1)
-
-    t.throws(() => new Busboy(), new Error('Busboy expected an options-Object.'))
-  })
+  t.throws(() => new Busboy(), new Error('Busboy expected an options-Object.'))
+})
 
-  t.test('should throw an Error if options does not contain headers', t => {
-    t.plan(1)
+test('busboy-constructor - should throw an Error if options does not contain headers', t => {
+  t.plan(1)
 
-    t.throws(() => new Busboy({}), new Error('Busboy expected an options-Object with headers-attribute.'))
-  })
+  t.throws(() => new Busboy({}), new Error('Busboy expected an options-Object with headers-attribute.'))
+})
 
-  t.test('if busboy is called without new-operator, still creates a busboy instance', t => {
-    t.plan(1)
+test('busboy-constructor - if busboy is called without new-operator, still creates a busboy instance', t => {
+  t.plan(1)
 
-    const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
-    t.type(busboyInstance, Busboy)
-  })
+  const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
+  t.type(busboyInstance, Busboy)
+})
 
-  t.test('should throw an Error if content-type is not set', t => {
-    t.plan(1)
+test('busboy-constructor - should throw an Error if content-type is not set', t => {
+  t.plan(1)
 
-    t.throws(() => new Busboy({ headers: {} }), new Error('Missing Content-Type-header.'))
-  })
+  t.throws(() => new Busboy({ headers: {} }), new Error('Missing Content-Type-header.'))
+})
 
-  t.test('should throw an Error if content-type is unsupported', t => {
-    t.plan(1)
+test('busboy-constructor - should throw an Error if content-type is unsupported', t => {
+  t.plan(1)
 
-    t.throws(() => new Busboy({ headers: { 'content-type': 'unsupported' } }), new Error('Unsupported Content-Type.'))
-  })
+  t.throws(() => new Busboy({ headers: { 'content-type': 'unsupported' } }), new Error('Unsupported Content-Type.'))
+})
 
-  t.test('should not throw an Error if content-type is urlencoded', t => {
-    t.plan(1)
+test('busboy-constructor - should not throw an Error if content-type is urlencoded', t => {
+  t.plan(1)
 
-    t.doesNotThrow(() => new Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } }))
-  })
+  t.doesNotThrow(() => new Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } }))
+})
 
-  t.test('if busboy is called without stream options autoDestroy is set to false', t => {
-    t.plan(1)
+test('busboy-constructor - if busboy is called without stream options autoDestroy is set to false', t => {
+  t.plan(1)
 
-    const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
-    t.equal(busboyInstance._writableState.autoDestroy, false)
-  })
+  const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
+  t.equal(busboyInstance._writableState.autoDestroy, false)
+})
 
-  t.test('if busboy is called with invalid value for stream option highWaterMark we should throw', t => {
-    t.plan(1)
+test('busboy-constructor - if busboy is called with invalid value for stream option highWaterMark we should throw', t => {
+  t.plan(1)
 
-    t.throws(() => Busboy({ highWaterMark: 'not_allowed_value_for_highWaterMark', headers: { 'content-type': 'application/x-www-form-urlencoded' } }), new Error('not_allowed_value_for_highWaterMark'))
-  })
+  t.throws(() => Busboy({ highWaterMark: 'not_allowed_value_for_highWaterMark', headers: { 'content-type': 'application/x-www-form-urlencoded' } }), new Error('not_allowed_value_for_highWaterMark'))
+})
 
-  t.test('if busboy is called with stream options and autoDestroy:true, autoDestroy should be set to true', t => {
-    t.plan(1)
+test('busboy-constructor - if busboy is called with stream options and autoDestroy:true, autoDestroy should be set to true', t => {
+  t.plan(1)
 
-    const busboyInstance = Busboy({ autoDestroy: true, headers: { 'content-type': 'application/x-www-form-urlencoded' } })
-    t.equal(busboyInstance._writableState.autoDestroy, true)
-  })
+  const busboyInstance = Busboy({ autoDestroy: true, headers: { 'content-type': 'application/x-www-form-urlencoded' } })
+  t.equal(busboyInstance._writableState.autoDestroy, true)
+})
 
-  t.test('busboy should be initialized with private attribute _done set as false', t => {
-    t.plan(1)
+test('busboy-constructor - busboy should be initialized with private attribute _done set as false', t => {
+  t.plan(1)
 
-    const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
-    t.equal(busboyInstance._done, false)
-  })
+  const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
+  t.equal(busboyInstance._done, false)
+})
 
-  t.test('busboy should be initialized with private attribute _finished set as false', t => {
-    t.plan(1)
+test('busboy-constructor - busboy should be initialized with private attribute _finished set as false', t => {
+  t.plan(1)
 
-    const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
-    t.equal(busboyInstance._finished, false)
-  })
+  const busboyInstance = Busboy({ headers: { 'content-type': 'application/x-www-form-urlencoded' } })
+  t.equal(busboyInstance._finished, false)
 })