diff --git a/package.json b/package.json
index 20bcc8e25..f00183694 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "build": "cross-env __GWD_ROLLUP_MODE__=strict node . build",
     "serve": "node . serve",
     "develop": "node . develop",
-    "test": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 c8 mocha --exclude \"./packages/**/test/cases/exp-*/**\" --exclude \"./packages/cli/test/cases/serve.default.ssr/**\" --exclude \"./packages/cli/test/cases/*.default.ssr-static-export/**\" \"./packages/**/**/*.spec.js\"",
+    "test": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 c8 mocha --exclude \"./packages/**/test/cases/exp-*/**\" \"./packages/**/**/*.spec.js\"",
     "test:exp": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 node --experimental-loader $(pwd)/test/test-loader.js ./node_modules/mocha/bin/mocha \"./packages/**/**/*.spec.js\"",
     "test:exp:win": "cross-env BROWSERSLIST_IGNORE_OLD_DATA=true __GWD_ROLLUP_MODE__=strict NODE_NO_WARNINGS=1 node --experimental-loader file:\\\\%cd%\\test\\test-loader.js ./node_modules/mocha/bin/mocha --exclude \"./packages/init/test/cases/**\" \"./packages/**/**/*.spec.js\"",
     "test:tdd": "yarn test --watch",
@@ -43,7 +43,7 @@
     "eslint": "^8.51.0",
     "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-no-only-tests": "^2.6.0",
-    "gallinago": "^0.7.0",
+    "gallinago": "^0.8.0",
     "glob-promise": "^3.4.0",
     "jsdom": "^16.5.0",
     "lerna": "^3.16.4",
diff --git a/packages/cli/test/cases/build.config.default/build.config.default.spec.js b/packages/cli/test/cases/build.config.default/build.config.default.spec.js
index b73d3ae6d..b976319bd 100644
--- a/packages/cli/test/cases/build.config.default/build.config.default.spec.js
+++ b/packages/cli/test/cases/build.config.default/build.config.default.spec.js
@@ -34,9 +34,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.config.error-dev-server-extensions/build.config.error-dev-server-extensions.spec.js b/packages/cli/test/cases/build.config.error-dev-server-extensions/build.config.error-dev-server-extensions.spec.js
index d224d4d62..8d3502d6e 100644
--- a/packages/cli/test/cases/build.config.error-dev-server-extensions/build.config.error-dev-server-extensions.spec.js
+++ b/packages/cli/test/cases/build.config.error-dev-server-extensions/build.config.error-dev-server-extensions.spec.js
@@ -30,7 +30,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -38,10 +38,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for devServer.extensions', function() {
-    it('should throw an error that provided extensions is not valid', async function() {
+    it('should throw an error that provided extensions is not valid', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: provided extensions is not an array.  Please provide an array like [\'.txt\', \'.foo\']');
       }
diff --git a/packages/cli/test/cases/build.config.error-dev-server-hud/build.config.error-dev-server-hud.spec.js b/packages/cli/test/cases/build.config.error-dev-server-hud/build.config.error-dev-server-hud.spec.js
index 49ecb6603..8b712ae3b 100644
--- a/packages/cli/test/cases/build.config.error-dev-server-hud/build.config.error-dev-server-hud.spec.js
+++ b/packages/cli/test/cases/build.config.error-dev-server-hud/build.config.error-dev-server-hud.spec.js
@@ -38,10 +38,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for devServer.hud', function() {
-    it('should throw an error that provided extensions is not valid', async function() {
+    it('should throw an error that provided extensions is not valid', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: greenwood.config.js devServer hud options must be a boolean.  Passed value was: 1234');
       }
diff --git a/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js b/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js
index f4d8c1004..8576871a7 100644
--- a/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js
+++ b/packages/cli/test/cases/build.config.error-optimization/build.config.error-optimization.spec.js
@@ -28,7 +28,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -36,10 +36,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for optimization', function() {
-    it('should throw an error that provided optimization is not valid', async function() {
+    it('should throw an error that provided optimization is not valid', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: provided optimization "loremipsum" is not supported.  Please use one of: default, none, static, inline.');
       }
diff --git a/packages/cli/test/cases/build.config.error-pages-directory/build.config.error-pages-directory.spec.js b/packages/cli/test/cases/build.config.error-pages-directory/build.config.error-pages-directory.spec.js
index c6f08f0d8..404d05a87 100644
--- a/packages/cli/test/cases/build.config.error-pages-directory/build.config.error-pages-directory.spec.js
+++ b/packages/cli/test/cases/build.config.error-pages-directory/build.config.error-pages-directory.spec.js
@@ -28,7 +28,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -36,10 +36,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for pagesDirectory', function() {
-    it('should throw an error that pagesDirectory must be a string', async function() {
+    it('should throw an error that pagesDirectory must be a string', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: provided pagesDirectory "[object Object]" is not supported.  Please make sure to pass something like \'docs/\'');
       }
diff --git a/packages/cli/test/cases/build.config.error-prerender/build.config.error-prerender.spec.js b/packages/cli/test/cases/build.config.error-prerender/build.config.error-prerender.spec.js
index 01954fa76..b58136a2c 100644
--- a/packages/cli/test/cases/build.config.error-prerender/build.config.error-prerender.spec.js
+++ b/packages/cli/test/cases/build.config.error-prerender/build.config.error-prerender.spec.js
@@ -28,7 +28,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -36,10 +36,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for Prerender', function() {
-    it('should throw an error that prerender must be a boolean', async function() {
+    it('should throw an error that prerender must be a boolean', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: greenwood.config.js prerender must be a boolean; true or false.  Passed value was typeof: object');
       }
diff --git a/packages/cli/test/cases/build.config.error-templates-directory/build.config.error-templates-directory.spec.js b/packages/cli/test/cases/build.config.error-templates-directory/build.config.error-templates-directory.spec.js
index 9ce122b05..8b481fd00 100644
--- a/packages/cli/test/cases/build.config.error-templates-directory/build.config.error-templates-directory.spec.js
+++ b/packages/cli/test/cases/build.config.error-templates-directory/build.config.error-templates-directory.spec.js
@@ -28,7 +28,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -36,10 +36,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for templatesDirectory', function() {
-    it('should throw an error that templatesDirectory must be a string', async function() {
+    it('should throw an error that templatesDirectory must be a string', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: provided templatesDirectory "[object Object]" is not supported.  Please make sure to pass something like \'layouts/\'');
       }
diff --git a/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js b/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js
index e1b101e84..d0492a201 100644
--- a/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js
+++ b/packages/cli/test/cases/build.config.error-workspace-absolute/build.config.error-workspace-absolute.spec.js
@@ -28,7 +28,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -36,10 +36,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value (absolute path) for Workspace', function() {
-    it('should throw an error that workspace path must exist', async function() {
+    it('should throw an error that workspace path must exist', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('greenwood.config.js workspace doesn\'t exist!');
       }
diff --git a/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js b/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js
index 82cd986a7..8f43aa2c6 100644
--- a/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js
+++ b/packages/cli/test/cases/build.config.error-workspace/build.config.error-workspace.spec.js
@@ -28,7 +28,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -36,10 +36,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for Workspace', function() {
-    it('should throw an error that workspace path must be a URL', async function() {
+    it('should throw an error that workspace path must be a URL', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: greenwood.config.js workspace must be an instance of URL');
       }
diff --git a/packages/cli/test/cases/build.config.interpolate-frontmatter/build.config.interpolate-frontmatter.spec.js b/packages/cli/test/cases/build.config.interpolate-frontmatter/build.config.interpolate-frontmatter.spec.js
index 6e4428eea..62b30ae9c 100644
--- a/packages/cli/test/cases/build.config.interpolate-frontmatter/build.config.interpolate-frontmatter.spec.js
+++ b/packages/cli/test/cases/build.config.interpolate-frontmatter/build.config.interpolate-frontmatter.spec.js
@@ -46,9 +46,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Frontmatter should be interpolated in the correct places', function() {
diff --git a/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js b/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js
index 1d01f6a3c..dee3cf822 100644
--- a/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js
+++ b/packages/cli/test/cases/build.config.markdown-custom.plugins/build.config.markdown-custom.spec.js
@@ -44,9 +44,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js b/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js
index 7b12820f4..2e23b620a 100644
--- a/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js
+++ b/packages/cli/test/cases/build.config.markdown-custom.settings/build.config.markdown-custom.settings.spec.js
@@ -33,7 +33,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -42,9 +42,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Custom Markdown Presets', function() {
diff --git a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
index 6a3aa9372..0b0c9131f 100644
--- a/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-default/build.config-optimization-default.spec.js
@@ -52,11 +52,11 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/prismjs/themes/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...prismCss
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Output for JavaScript / CSS tags and files', function() {
diff --git a/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js b/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js
index 97f0b84b4..149ae06dd 100644
--- a/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-inline/build.config-optimization-inline.spec.js
@@ -40,7 +40,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -49,9 +49,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Output for JavaScript / CSS tags and files', function() {
diff --git a/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js b/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js
index 80c7ced8a..64bde152d 100644
--- a/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-none/build.config-optimization-none.spec.js
@@ -48,9 +48,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Output for JavaScript / CSS tags and files', function() {
diff --git a/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js b/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js
index 098c04d0f..4698f8a16 100644
--- a/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-overrides/build.config-optimization-overrides.spec.js
@@ -37,7 +37,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -46,9 +46,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Cumulative output based on all override settings', function() {
diff --git a/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js b/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js
index 2875a5309..a9ede0c53 100644
--- a/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js
+++ b/packages/cli/test/cases/build.config.optimization-static/build.config-optimization-static.spec.js
@@ -36,7 +36,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -45,9 +45,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('JavaScript <script> tag and file static optimization', function() {
diff --git a/packages/cli/test/cases/build.config.pages-directory/build.config.pages-directory.spec.js b/packages/cli/test/cases/build.config.pages-directory/build.config.pages-directory.spec.js
index 46af51753..b19279cca 100644
--- a/packages/cli/test/cases/build.config.pages-directory/build.config.pages-directory.spec.js
+++ b/packages/cli/test/cases/build.config.pages-directory/build.config.pages-directory.spec.js
@@ -45,9 +45,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.config.prerender/build.config.prerender.spec.js b/packages/cli/test/cases/build.config.prerender/build.config.prerender.spec.js
index 3a45b3905..6a86102e6 100644
--- a/packages/cli/test/cases/build.config.prerender/build.config.prerender.spec.js
+++ b/packages/cli/test/cases/build.config.prerender/build.config.prerender.spec.js
@@ -45,9 +45,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.config.static-router/build.config.static-router.spec.js b/packages/cli/test/cases/build.config.static-router/build.config.static-router.spec.js
index 4e7cf7fdc..56a992c28 100644
--- a/packages/cli/test/cases/build.config.static-router/build.config.static-router.spec.js
+++ b/packages/cli/test/cases/build.config.static-router/build.config.static-router.spec.js
@@ -38,7 +38,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -53,11 +53,11 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@greenwood/cli/src/lib`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodRouterLibs
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.config.templates-directory/build.config.templates-directory.spec.js b/packages/cli/test/cases/build.config.templates-directory/build.config.templates-directory.spec.js
index 58a626b38..baac1c79b 100644
--- a/packages/cli/test/cases/build.config.templates-directory/build.config.templates-directory.spec.js
+++ b/packages/cli/test/cases/build.config.templates-directory/build.config.templates-directory.spec.js
@@ -47,9 +47,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.config.workspace-custom/build.config.workspace-custom.spec.js b/packages/cli/test/cases/build.config.workspace-custom/build.config.workspace-custom.spec.js
index cdccc1426..814efe705 100644
--- a/packages/cli/test/cases/build.config.workspace-custom/build.config.workspace-custom.spec.js
+++ b/packages/cli/test/cases/build.config.workspace-custom/build.config.workspace-custom.spec.js
@@ -44,9 +44,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.import-node-modules/build.default.import-node-modules.spec.js b/packages/cli/test/cases/build.default.import-node-modules/build.default.import-node-modules.spec.js
index 3d79f6fdd..ddb147b5d 100644
--- a/packages/cli/test/cases/build.default.import-node-modules/build.default.import-node-modules.spec.js
+++ b/packages/cli/test/cases/build.default.import-node-modules/build.default.import-node-modules.spec.js
@@ -35,7 +35,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -169,7 +169,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/prismjs/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...reduxLibs,
         ...reduxPackageJson,
@@ -202,7 +202,7 @@ describe('Build Greenwood With: ', function() {
         ...simpleCss,
         ...simpleCssPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
 
       dom = await JSDOM.fromFile(path.resolve(this.context.publicDir, 'index.html'));
     });
diff --git a/packages/cli/test/cases/build.default.markdown/build.default.markdown.spec.js b/packages/cli/test/cases/build.default.markdown/build.default.markdown.spec.js
index db607e995..492c3aba4 100644
--- a/packages/cli/test/cases/build.default.markdown/build.default.markdown.spec.js
+++ b/packages/cli/test/cases/build.default.markdown/build.default.markdown.spec.js
@@ -30,7 +30,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -38,9 +38,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.meta-files/build.default.meta-files.spec.js b/packages/cli/test/cases/build.default.meta-files/build.default.meta-files.spec.js
index e44f72a57..a3c52e259 100644
--- a/packages/cli/test/cases/build.default.meta-files/build.default.meta-files.spec.js
+++ b/packages/cli/test/cases/build.default.meta-files/build.default.meta-files.spec.js
@@ -41,9 +41,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.meta/build.default.meta.spec.js b/packages/cli/test/cases/build.default.meta/build.default.meta.spec.js
index b73814860..23efa5a6d 100644
--- a/packages/cli/test/cases/build.default.meta/build.default.meta.spec.js
+++ b/packages/cli/test/cases/build.default.meta/build.default.meta.spec.js
@@ -48,9 +48,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.quick-start-npx/build.default.quick-start-npx.spec.js b/packages/cli/test/cases/build.default.quick-start-npx/build.default.quick-start-npx.spec.js
index de40d996e..b49e663c6 100644
--- a/packages/cli/test/cases/build.default.quick-start-npx/build.default.quick-start-npx.spec.js
+++ b/packages/cli/test/cases/build.default.quick-start-npx/build.default.quick-start-npx.spec.js
@@ -41,9 +41,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.spa/build.default.spa.spec.js b/packages/cli/test/cases/build.default.spa/build.default.spa.spec.js
index 715406eb5..0905ab808 100644
--- a/packages/cli/test/cases/build.default.spa/build.default.spa.spec.js
+++ b/packages/cli/test/cases/build.default.spa/build.default.spa.spec.js
@@ -39,7 +39,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -176,7 +176,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/redux-thunk/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -210,7 +210,7 @@ describe('Build Greenwood With: ', function() {
         ...reduxThunkPackageJson,
         ...reduxThunk
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.ssr-prerender/build.default.ssr-prerender.spec.js b/packages/cli/test/cases/build.default.ssr-prerender/build.default.ssr-prerender.spec.js
index 16927f2da..8a2848228 100644
--- a/packages/cli/test/cases/build.default.ssr-prerender/build.default.ssr-prerender.spec.js
+++ b/packages/cli/test/cases/build.default.ssr-prerender/build.default.ssr-prerender.spec.js
@@ -38,7 +38,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -47,9 +47,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.ssr-static-export/build.default.ssr-static-export.spec.js b/packages/cli/test/cases/build.default.ssr-static-export/build.default.ssr-static-export.spec.js
index bbf6b87b5..71582d099 100644
--- a/packages/cli/test/cases/build.default.ssr-static-export/build.default.ssr-static-export.spec.js
+++ b/packages/cli/test/cases/build.default.ssr-static-export/build.default.ssr-static-export.spec.js
@@ -38,7 +38,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -107,7 +107,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -124,7 +124,7 @@ describe('Build Greenwood With: ', function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.title/build.default.title.spec.js b/packages/cli/test/cases/build.default.title/build.default.title.spec.js
index 6af461290..6a755bac1 100644
--- a/packages/cli/test/cases/build.default.title/build.default.title.spec.js
+++ b/packages/cli/test/cases/build.default.title/build.default.title.spec.js
@@ -46,9 +46,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-404-markdown/build.default.workspace-404-markdown.spec.js b/packages/cli/test/cases/build.default.workspace-404-markdown/build.default.workspace-404-markdown.spec.js
index 0df45bd97..2084a4b79 100644
--- a/packages/cli/test/cases/build.default.workspace-404-markdown/build.default.workspace-404-markdown.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-404-markdown/build.default.workspace-404-markdown.spec.js
@@ -50,9 +50,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-404/build.default.workspace-404.spec.js b/packages/cli/test/cases/build.default.workspace-404/build.default.workspace-404.spec.js
index 9a1c06037..18bcb2140 100644
--- a/packages/cli/test/cases/build.default.workspace-404/build.default.workspace-404.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-404/build.default.workspace-404.spec.js
@@ -50,9 +50,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-assets/build.default.workspace-assets.spec.js b/packages/cli/test/cases/build.default.workspace-assets/build.default.workspace-assets.spec.js
index f8b6eda1d..ed781e5f7 100644
--- a/packages/cli/test/cases/build.default.workspace-assets/build.default.workspace-assets.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-assets/build.default.workspace-assets.spec.js
@@ -36,9 +36,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-frontmatter-imports/build.default.workspace-frontmatter-imports.spec.js b/packages/cli/test/cases/build.default.workspace-frontmatter-imports/build.default.workspace-frontmatter-imports.spec.js
index cd9db6ea3..d5f789371 100644
--- a/packages/cli/test/cases/build.default.workspace-frontmatter-imports/build.default.workspace-frontmatter-imports.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-frontmatter-imports/build.default.workspace-frontmatter-imports.spec.js
@@ -43,7 +43,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -52,9 +52,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-getting-started/build.default.workspace-getting-started.spec.js b/packages/cli/test/cases/build.default.workspace-getting-started/build.default.workspace-getting-started.spec.js
index 12eb7438c..12e6ec868 100644
--- a/packages/cli/test/cases/build.default.workspace-getting-started/build.default.workspace-getting-started.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-getting-started/build.default.workspace-getting-started.spec.js
@@ -56,9 +56,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-javascript-css-remote/build.default.workspace-javascript-css-remote.spec.js b/packages/cli/test/cases/build.default.workspace-javascript-css-remote/build.default.workspace-javascript-css-remote.spec.js
index 1139eef22..e0d059b86 100644
--- a/packages/cli/test/cases/build.default.workspace-javascript-css-remote/build.default.workspace-javascript-css-remote.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-javascript-css-remote/build.default.workspace-javascript-css-remote.spec.js
@@ -44,8 +44,8 @@ describe('Build Greenwood With: ', function() {
     let dom;
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
       dom = await JSDOM.fromFile(path.resolve(this.context.publicDir, 'index.html'));
     });
diff --git a/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js b/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js
index 449285aea..1265601d1 100644
--- a/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-javascript-css/build.default.workspace-javascript-css.spec.js
@@ -48,8 +48,8 @@ describe('Build Greenwood With: ', function() {
     let dom;
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
       dom = await JSDOM.fromFile(path.resolve(this.context.publicDir, 'index.html'));
     });
diff --git a/packages/cli/test/cases/build.default.workspace-nested/build.default.workspace-nested.spec.js b/packages/cli/test/cases/build.default.workspace-nested/build.default.workspace-nested.spec.js
index a367ac923..f14766089 100644
--- a/packages/cli/test/cases/build.default.workspace-nested/build.default.workspace-nested.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-nested/build.default.workspace-nested.spec.js
@@ -65,9 +65,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-template-app/build.default.workspace-template-app.spec.js b/packages/cli/test/cases/build.default.workspace-template-app/build.default.workspace-template-app.spec.js
index e5b4d1aab..7f9a03ecd 100644
--- a/packages/cli/test/cases/build.default.workspace-template-app/build.default.workspace-template-app.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-template-app/build.default.workspace-template-app.spec.js
@@ -43,9 +43,9 @@ describe('Build Greenwood With: ', function() {
   describe(LABEL, function() {
     let dom;
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js b/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
index 861478067..6ed4c6a67 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page-and-app/build.default.workspace-template-page-and-app.spec.js
@@ -51,9 +51,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-template-page-bare-merging/build.default.workspace-template-page-bare-merging.spec.js b/packages/cli/test/cases/build.default.workspace-template-page-bare-merging/build.default.workspace-template-page-bare-merging.spec.js
index 1d858b9ff..35647d25d 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page-bare-merging/build.default.workspace-template-page-bare-merging.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page-bare-merging/build.default.workspace-template-page-bare-merging.spec.js
@@ -44,8 +44,8 @@ describe('Build Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-template-page/build.default.workspace-template-page.spec.js b/packages/cli/test/cases/build.default.workspace-template-page/build.default.workspace-template-page.spec.js
index f98558161..e7062b94d 100644
--- a/packages/cli/test/cases/build.default.workspace-template-page/build.default.workspace-template-page.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-template-page/build.default.workspace-template-page.spec.js
@@ -36,7 +36,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -45,9 +45,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-templates-empty/build.default.workspace-templates-empty.spec.js b/packages/cli/test/cases/build.default.workspace-templates-empty/build.default.workspace-templates-empty.spec.js
index c3299586c..6791a55b6 100644
--- a/packages/cli/test/cases/build.default.workspace-templates-empty/build.default.workspace-templates-empty.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-templates-empty/build.default.workspace-templates-empty.spec.js
@@ -49,9 +49,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-templates-relative-paths/build.default.workspace-templates-relative-paths.spec.js b/packages/cli/test/cases/build.default.workspace-templates-relative-paths/build.default.workspace-templates-relative-paths.spec.js
index 15a13acb0..9e6a21955 100644
--- a/packages/cli/test/cases/build.default.workspace-templates-relative-paths/build.default.workspace-templates-relative-paths.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-templates-relative-paths/build.default.workspace-templates-relative-paths.spec.js
@@ -62,11 +62,11 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/prismjs/themes/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...prismCss
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-top-level-pages/build.default.workspace-top-level-pages.spec.js b/packages/cli/test/cases/build.default.workspace-top-level-pages/build.default.workspace-top-level-pages.spec.js
index 81c40225d..39d18b59d 100644
--- a/packages/cli/test/cases/build.default.workspace-top-level-pages/build.default.workspace-top-level-pages.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-top-level-pages/build.default.workspace-top-level-pages.spec.js
@@ -43,9 +43,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default.workspace-user-directory-mapping/build.default.workspace-user-directory-mapping.spec.js b/packages/cli/test/cases/build.default.workspace-user-directory-mapping/build.default.workspace-user-directory-mapping.spec.js
index 6cb62d558..0d6a88532 100644
--- a/packages/cli/test/cases/build.default.workspace-user-directory-mapping/build.default.workspace-user-directory-mapping.spec.js
+++ b/packages/cli/test/cases/build.default.workspace-user-directory-mapping/build.default.workspace-user-directory-mapping.spec.js
@@ -56,9 +56,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async () => {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.default/build.default.spec.js b/packages/cli/test/cases/build.default/build.default.spec.js
index 6c84b68da..7eb653cb2 100644
--- a/packages/cli/test/cases/build.default/build.default.spec.js
+++ b/packages/cli/test/cases/build.default/build.default.spec.js
@@ -39,9 +39,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js b/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js
index a396264e1..c3fd39b24 100644
--- a/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js
+++ b/packages/cli/test/cases/build.plugins.adapter/build.config.plugins-adapter.spec.js
@@ -51,9 +51,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Adapting an SSR Page', function() {
diff --git a/packages/cli/test/cases/build.plugins.context/build.plugins.context.spec.js b/packages/cli/test/cases/build.plugins.context/build.plugins.context.spec.js
index bad5e851b..457e18c19 100644
--- a/packages/cli/test/cases/build.plugins.context/build.plugins.context.spec.js
+++ b/packages/cli/test/cases/build.plugins.context/build.plugins.context.spec.js
@@ -60,13 +60,13 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/my-theme-pack/dist/components`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...themePacktemplates,
         ...themePackStyles,
         ...themePackComponents
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.plugins.copy/build.plugins.copy.spec.js b/packages/cli/test/cases/build.plugins.copy/build.plugins.copy.spec.js
index 733a71645..0a47a771f 100644
--- a/packages/cli/test/cases/build.plugins.copy/build.plugins.copy.spec.js
+++ b/packages/cli/test/cases/build.plugins.copy/build.plugins.copy.spec.js
@@ -43,11 +43,11 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/prismjs/themes/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...prismCss
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/build.plugins.error-name/build.plugins.error-name.spec.js b/packages/cli/test/cases/build.plugins.error-name/build.plugins.error-name.spec.js
index 6c72086b0..9d438a2a1 100644
--- a/packages/cli/test/cases/build.plugins.error-name/build.plugins.error-name.spec.js
+++ b/packages/cli/test/cases/build.plugins.error-name/build.plugins.error-name.spec.js
@@ -33,7 +33,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -41,10 +41,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad name value for a plugin', function() {
-    it('should throw an error that plugin.name is not a string', async function() {
+    it('should throw an error that plugin.name is not a string', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: greenwood.config.js plugins must have a name. got undefined instead.');
       }
diff --git a/packages/cli/test/cases/build.plugins.error-provider/build.plugins.error-provider.spec.js b/packages/cli/test/cases/build.plugins.error-provider/build.plugins.error-provider.spec.js
index e807bf8d4..298c4eee4 100644
--- a/packages/cli/test/cases/build.plugins.error-provider/build.plugins.error-provider.spec.js
+++ b/packages/cli/test/cases/build.plugins.error-provider/build.plugins.error-provider.spec.js
@@ -34,7 +34,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -42,10 +42,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad provider value for a plugin', function() {
-    it('should throw an error that plugin.provider is not a function', async function() {
+    it('should throw an error that plugin.provider is not a function', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: greenwood.config.js plugins provider must be a function. got object instead.');
       }
diff --git a/packages/cli/test/cases/build.plugins.error-type/build.plugins.error-type.spec.js b/packages/cli/test/cases/build.plugins.error-type/build.plugins.error-type.spec.js
index 9fedaf24f..bae8b110b 100644
--- a/packages/cli/test/cases/build.plugins.error-type/build.plugins.error-type.spec.js
+++ b/packages/cli/test/cases/build.plugins.error-type/build.plugins.error-type.spec.js
@@ -34,7 +34,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -42,12 +42,12 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Custom Configuration with a bad value for plugin type', function() {
-    it('should throw an error that plugin.type is not a valid value', async function() {
+    it('should throw an error that plugin.type is not a valid value', function() {
       const pluginTypes = ['copy', 'context', 'resource', 'rollup', 'server', 'source', 'renderer', 'adapter'];
 
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain(`Error: greenwood.config.js plugins must be one of type "${pluginTypes.join(', ')}". got "indexxx" instead.`);
       }
diff --git a/packages/cli/test/cases/build.plugins.resource/build.config.plugins-resource.spec.js b/packages/cli/test/cases/build.plugins.resource/build.config.plugins-resource.spec.js
index e5e414e61..2a692ce58 100644
--- a/packages/cli/test/cases/build.plugins.resource/build.config.plugins-resource.spec.js
+++ b/packages/cli/test/cases/build.plugins.resource/build.config.plugins-resource.spec.js
@@ -53,9 +53,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Transpiling and DOM Manipulation', function() {
diff --git a/packages/cli/test/cases/build.plugins.source/build.plugins-source.spec.js b/packages/cli/test/cases/build.plugins.source/build.plugins-source.spec.js
index 177132606..18dfb6461 100644
--- a/packages/cli/test/cases/build.plugins.source/build.plugins-source.spec.js
+++ b/packages/cli/test/cases/build.plugins.source/build.plugins-source.spec.js
@@ -58,9 +58,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/develop.config.base-path/develop.config.base-path.spec.js b/packages/cli/test/cases/develop.config.base-path/develop.config.base-path.spec.js
index e70c56a98..916adbe78 100644
--- a/packages/cli/test/cases/develop.config.base-path/develop.config.base-path.spec.js
+++ b/packages/cli/test/cases/develop.config.base-path/develop.config.base-path.spec.js
@@ -62,16 +62,16 @@ describe('Develop Greenwood With: ', function() {
 
     before(async function() {
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath)
       ]);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js b/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js
index 41f5801b0..f62288eab 100644
--- a/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js
+++ b/packages/cli/test/cases/develop.default.hud-disabled/develop.default.hud-disabled.spec.js
@@ -44,14 +44,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.setup(outputPath, getSetupFiles(outputPath));
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js b/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js
index 4d0d00b04..a9fc14d66 100644
--- a/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js
+++ b/packages/cli/test/cases/develop.default.hud/develop.default.hud.spec.js
@@ -44,14 +44,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.setup(outputPath, getSetupFiles(outputPath));
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/develop.default/develop.default.spec.js b/packages/cli/test/cases/develop.default/develop.default.spec.js
index b6fd01a72..8c3cf16e2 100644
--- a/packages/cli/test/cases/develop.default/develop.default.spec.js
+++ b/packages/cli/test/cases/develop.default/develop.default.spec.js
@@ -375,7 +375,7 @@ describe('Develop Greenwood With: ', function() {
         `${outputPath}/node_modules/regenerator-runtime/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -446,12 +446,12 @@ describe('Develop Greenwood With: ', function() {
         ...stencilCoreClientLibs
       ]);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js b/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js
index 438931fce..4c3aad577 100644
--- a/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js
+++ b/packages/cli/test/cases/develop.plugins.context/develop.plugins.context.spec.js
@@ -47,14 +47,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/develop.spa/develop.spa.spec.js b/packages/cli/test/cases/develop.spa/develop.spa.spec.js
index f4b492202..2020b8f3d 100644
--- a/packages/cli/test/cases/develop.spa/develop.spa.spec.js
+++ b/packages/cli/test/cases/develop.spa/develop.spa.spec.js
@@ -59,14 +59,14 @@ describe('Develop Greenwood With: ', function() {
         `${outputPath}/node_modules/simpledotcss/`
       );
 
-      await runner.setup(outputPath, [...simpleCss]);
+      runner.setup(outputPath, [...simpleCss]);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js b/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
index 1f1bf608c..4f7919f66 100644
--- a/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
+++ b/packages/cli/test/cases/develop.ssr/develop.ssr.spec.js
@@ -38,7 +38,7 @@ describe('Develop Greenwood With: ', function() {
   const hostname = 'http://127.0.0.1:1984';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -107,7 +107,7 @@ describe('Develop Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -125,12 +125,12 @@ describe('Develop Greenwood With: ', function() {
         ...litReactiveElementPackageJson
       ]);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/eject.default/eject.default.spec.js b/packages/cli/test/cases/eject.default/eject.default.spec.js
index df37577cd..1eb3d0473 100644
--- a/packages/cli/test/cases/eject.default/eject.default.spec.js
+++ b/packages/cli/test/cases/eject.default/eject.default.spec.js
@@ -24,7 +24,7 @@ describe('Eject Greenwood', function() {
   let runner;
   let configFiles;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -33,9 +33,9 @@ describe('Eject Greenwood', function() {
 
   describe('Default Eject', function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'eject');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'eject');
 
       configFiles = fs.readdirSync(fileURLToPath(new URL('.', import.meta.url)))
         .filter((file) => path.extname(file) === '.js' && file.indexOf('spec.js') < 0);
@@ -59,9 +59,9 @@ describe('Eject Greenwood', function() {
 
   describe('Eject and Build Ejected Config', function() {
 
-    before(async function() {
-      await runner.runCommand(cliPath, 'build');
-      await runner.runCommand(cliPath, 'eject');
+    before(function() {
+      runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'eject');
     });
 
     runSmokeTest(['public', 'index'], 'Eject and Build Ejected Config');
diff --git a/packages/cli/test/cases/serve.config.base-path/serve.config.base-path.spec.js b/packages/cli/test/cases/serve.config.base-path/serve.config.base-path.spec.js
index 62c3f3f60..99084c714 100644
--- a/packages/cli/test/cases/serve.config.base-path/serve.config.base-path.spec.js
+++ b/packages/cli/test/cases/serve.config.base-path/serve.config.base-path.spec.js
@@ -67,18 +67,18 @@ describe('Serve Greenwood With: ', function() {
         `${outputPath}/node_modules/@greenwood/cli/src/lib`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodRouterLibs
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js b/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js
index d3be8b253..a5d5b93b2 100644
--- a/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js
+++ b/packages/cli/test/cases/serve.config.static-router/serve.config.static-router.spec.js
@@ -52,19 +52,19 @@ describe('Serve Greenwood With: ', function() {
         `${outputPath}/node_modules/@greenwood/cli/src/lib`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodRouterLibs
       ]);
 
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(async () => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js b/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js
index 4e9ce751b..3baa2e383 100644
--- a/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js
+++ b/packages/cli/test/cases/serve.default.api/serve.default.api.spec.js
@@ -49,15 +49,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.default.error/serve.default.error.spec.js b/packages/cli/test/cases/serve.default.error/serve.default.error.spec.js
index a7d8a9cb1..09311eeef 100644
--- a/packages/cli/test/cases/serve.default.error/serve.default.error.spec.js
+++ b/packages/cli/test/cases/serve.default.error/serve.default.error.spec.js
@@ -27,7 +27,7 @@ describe('Serve Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -35,10 +35,10 @@ describe('Serve Greenwood With: ', function() {
   });
 
   describe('Running the serve command without running the build command first', function() {
-    it('should throw an error that no build output was detected', async function() {
+    it('should throw an error that no build output was detected', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'serve');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'serve', { async: true });
       } catch (err) {
         expect(err).to.contain('No build output detected.  Make sure you have run greenwood build');
       }
diff --git a/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js b/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js
index ecdd62f82..db289fc24 100644
--- a/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr-prerender-api-hybrid/serve.default.ssr-prerender-api-hybrid.spec.js
@@ -54,15 +54,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js b/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js
index e3d382c5d..38c532601 100644
--- a/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr-prerender/serve.default.ssr-prerender.spec.js
@@ -40,7 +40,7 @@ describe('Serve Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -51,15 +51,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js b/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js
index 977b201a6..26fa97766 100644
--- a/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr-static-export/serve.default.ssr-static-export.spec.js
@@ -39,7 +39,7 @@ describe('Serve Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -109,7 +109,7 @@ describe('Serve Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -129,15 +129,15 @@ describe('Serve Greenwood With: ', function() {
     });
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js b/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js
index 4490f5e17..bd9c6ac79 100644
--- a/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js
+++ b/packages/cli/test/cases/serve.default.ssr/serve.default.ssr.spec.js
@@ -48,7 +48,7 @@ describe('Serve Greenwood With: ', function() {
   const hostname = 'http://127.0.0.1:8181';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -59,15 +59,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.default/serve.default.spec.js b/packages/cli/test/cases/serve.default/serve.default.spec.js
index ca93bc372..6b0588ac8 100644
--- a/packages/cli/test/cases/serve.default/serve.default.spec.js
+++ b/packages/cli/test/cases/serve.default/serve.default.spec.js
@@ -58,15 +58,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/serve.spa/serve.spa.spec.js b/packages/cli/test/cases/serve.spa/serve.spa.spec.js
index 912a546bb..5daa74c1e 100644
--- a/packages/cli/test/cases/serve.spa/serve.spa.spec.js
+++ b/packages/cli/test/cases/serve.spa/serve.spa.spec.js
@@ -54,15 +54,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath);
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/cli/test/cases/theme-pack/theme-pack.build.spec.js b/packages/cli/test/cases/theme-pack/theme-pack.build.spec.js
index dfde9d685..81c9fce35 100644
--- a/packages/cli/test/cases/theme-pack/theme-pack.build.spec.js
+++ b/packages/cli/test/cases/theme-pack/theme-pack.build.spec.js
@@ -65,13 +65,13 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/my-theme-pack/dist/components`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...themePacktemplates,
         ...themePackStyles,
         ...themePackComponents
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js b/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js
index 85b455571..5ad12fb19 100644
--- a/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js
+++ b/packages/cli/test/cases/theme-pack/theme-pack.develop.spec.js
@@ -54,14 +54,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/init/test/cases/build.default/build.default.spec.js b/packages/init/test/cases/build.default/build.default.spec.js
index a0409a304..16a45e617 100644
--- a/packages/init/test/cases/build.default/build.default.spec.js
+++ b/packages/init/test/cases/build.default/build.default.spec.js
@@ -36,17 +36,17 @@ xdescribe('Scaffold Greenwood and Run Build command: ', function() {
 
   describe('default minimal template', function () {
 
-    before(async function() {
-      await runner.setup(outputPath);
-      await runner.runCommand(initPath, '--install');
+    before(function() {
+      runner.setup(outputPath);
+      runner.runCommand(initPath, '--install');
     });
 
     describe(`should build ${LABEL}`, function () {
       const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
 
-      before(async function() {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+      before(function() {
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       });
 
       runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/init/test/cases/develop.default/develop.default.spec.js b/packages/init/test/cases/develop.default/develop.default.spec.js
index c6a5ba83a..febd785c0 100644
--- a/packages/init/test/cases/develop.default/develop.default.spec.js
+++ b/packages/init/test/cases/develop.default/develop.default.spec.js
@@ -37,9 +37,9 @@ xdescribe('Scaffold Greenwood and Run Develop command: ', function() {
 
   describe('default minimal template', function () {
 
-    before(async function() {
-      await runner.setup(outputPath);
-      await runner.runCommand(initPath, '--install');
+    before(function() {
+      runner.setup(outputPath);
+      runner.runCommand(initPath, '--install');
     });
 
     describe('Develop Greenwood With: ', function() {
@@ -60,16 +60,16 @@ xdescribe('Scaffold Greenwood and Run Develop command: ', function() {
 
         before(async function() {
 
-          await runner.setup(outputPath, [
+          runner.setup(outputPath, [
             ...getSetupFiles(outputPath)
           ]);
 
-          return new Promise(async (resolve) => {
+          return new Promise((resolve) => {
             setTimeout(() => {
               resolve();
             }, 5000);
 
-            await runner.runCommand(cliPath, 'develop');
+            runner.runCommand(cliPath, 'develop', { async: true });
           });
         });
 
diff --git a/packages/init/test/cases/init.default/init.default.spec.js b/packages/init/test/cases/init.default/init.default.spec.js
index f451064b3..ece4a86de 100644
--- a/packages/init/test/cases/init.default/init.default.spec.js
+++ b/packages/init/test/cases/init.default/init.default.spec.js
@@ -35,8 +35,8 @@ describe('Scaffold Greenwood With Default Template: ', function() {
 
     before(async function() {
       await fs.promises.mkdir(outputPath);
-      await runner.setup(outputPath);
-      await runner.runCommand(initPath);
+      runner.setup(outputPath);
+      runner.runCommand(initPath);
     });
 
     describe('should scaffold project files and folders', () => {
diff --git a/packages/init/test/cases/init.template/init.template.spec.js b/packages/init/test/cases/init.template/init.template.spec.js
index 34f9e8158..008274306 100644
--- a/packages/init/test/cases/init.template/init.template.spec.js
+++ b/packages/init/test/cases/init.template/init.template.spec.js
@@ -33,9 +33,9 @@ describe('Scaffold Greenwood From a (Blog) Template: ', function() {
 
   describe('default blog template', function () {
 
-    before(async function() {
-      await runner.setup(outputPath);
-      await runner.runCommand(initPath, '--template=blog');
+    before(function() {
+      runner.setup(outputPath);
+      runner.runCommand(initPath, '--template=blog');
     });
 
     describe('expected file output', function () {
diff --git a/packages/init/test/cases/init.yarn/init.yarn.spec.js b/packages/init/test/cases/init.yarn/init.yarn.spec.js
index 8f9f65c13..4728e9667 100644
--- a/packages/init/test/cases/init.yarn/init.yarn.spec.js
+++ b/packages/init/test/cases/init.yarn/init.yarn.spec.js
@@ -36,16 +36,16 @@ xdescribe('Scaffold Greenwood With Yarn: ', function() {
 
   describe('default minimal template', function () {
 
-    before(async function() {
-      await runner.setup(outputPath);
-      await runner.runCommand(initPath, '--yarn');
+    before(function() {
+      runner.setup(outputPath);
+      runner.runCommand(initPath, '--yarn');
     });
 
     describe('should install with Yarn', function () {
       const cliPath = path.join(process.cwd(), 'packages/cli/src/index.js');
 
-      before(async function() {
-        await runner.runCommand(cliPath, 'build');
+      before(function() {
+        runner.runCommand(cliPath, 'build');
       });
 
       runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-adapter-netlify/test/cases/build.config.base-path/build.config.base-path.spec.js b/packages/plugin-adapter-netlify/test/cases/build.config.base-path/build.config.base-path.spec.js
index 9bd94ebf5..10c60f9ad 100644
--- a/packages/plugin-adapter-netlify/test/cases/build.config.base-path/build.config.base-path.spec.js
+++ b/packages/plugin-adapter-netlify/test/cases/build.config.base-path/build.config.base-path.spec.js
@@ -47,7 +47,7 @@ describe('Build Greenwood With: ', function() {
   const netlifyFunctionsOutputUrl = new URL('./netlify/functions/', import.meta.url);
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -55,9 +55,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Default Output', function() {
diff --git a/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js b/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js
index 96db93136..e51a2059d 100644
--- a/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js
+++ b/packages/plugin-adapter-netlify/test/cases/build.default/build.default.spec.js
@@ -57,7 +57,7 @@ describe('Build Greenwood With: ', function() {
   const hostname = 'http://www.example.com';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -65,9 +65,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Default Output', function() {
diff --git a/packages/plugin-adapter-vercel/test/cases/build.config.base-path/build.config.base-path.spec.js b/packages/plugin-adapter-vercel/test/cases/build.config.base-path/build.config.base-path.spec.js
index f0c82987b..f48fd1eec 100644
--- a/packages/plugin-adapter-vercel/test/cases/build.config.base-path/build.config.base-path.spec.js
+++ b/packages/plugin-adapter-vercel/test/cases/build.config.base-path/build.config.base-path.spec.js
@@ -56,9 +56,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Default Output', function() {
diff --git a/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js b/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js
index c553414e6..2c6f64239 100644
--- a/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js
+++ b/packages/plugin-adapter-vercel/test/cases/build.default/build.default.spec.js
@@ -58,7 +58,7 @@ describe('Build Greenwood With: ', function() {
   const hostname = 'http://www.example.com';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -66,9 +66,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     describe('Default Output', function() {
diff --git a/packages/plugin-babel/test/cases/default/default.spec.js b/packages/plugin-babel/test/cases/default/default.spec.js
index 168e75521..1f6db73bb 100644
--- a/packages/plugin-babel/test/cases/default/default.spec.js
+++ b/packages/plugin-babel/test/cases/default/default.spec.js
@@ -42,7 +42,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -51,9 +51,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-babel/test/cases/options.extend-config/options.extend-config.spec.js b/packages/plugin-babel/test/cases/options.extend-config/options.extend-config.spec.js
index 6e9eb201d..01d321a80 100644
--- a/packages/plugin-babel/test/cases/options.extend-config/options.extend-config.spec.js
+++ b/packages/plugin-babel/test/cases/options.extend-config/options.extend-config.spec.js
@@ -52,7 +52,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -62,9 +62,9 @@ describe('Build Greenwood With: ', function() {
   describe(LABEL, function() {
     let jsFiles;
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
       jsFiles = glob.sync(path.join(this.context.publicDir, '*.js'));
     });
diff --git a/packages/plugin-google-analytics/test/cases/default/default.spec.js b/packages/plugin-google-analytics/test/cases/default/default.spec.js
index bfaba3b53..3d492015c 100644
--- a/packages/plugin-google-analytics/test/cases/default/default.spec.js
+++ b/packages/plugin-google-analytics/test/cases/default/default.spec.js
@@ -40,7 +40,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -48,9 +48,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-google-analytics/test/cases/error-analytics-id/error-analytics-id.spec.js b/packages/plugin-google-analytics/test/cases/error-analytics-id/error-analytics-id.spec.js
index d2dfc4026..ab54eb6ef 100644
--- a/packages/plugin-google-analytics/test/cases/error-analytics-id/error-analytics-id.spec.js
+++ b/packages/plugin-google-analytics/test/cases/error-analytics-id/error-analytics-id.spec.js
@@ -41,10 +41,10 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe('Google Analytics Plugin with a bad value for analyticsId', function() {
-    it('should throw an error that analyticsId must be a string', async function() {
+    it('should throw an error that analyticsId must be a string', function() {
       try {
-        await runner.setup(outputPath);
-        await runner.runCommand(cliPath, 'build');
+        runner.setup(outputPath);
+        runner.runCommand(cliPath, 'build');
       } catch (err) {
         expect(err).to.contain('Error: analyticsId should be of type string.  got "undefined" instead.');
       }
diff --git a/packages/plugin-google-analytics/test/cases/option-anonymous/option-anonymous.spec.js b/packages/plugin-google-analytics/test/cases/option-anonymous/option-anonymous.spec.js
index 3705dca7d..4b85bca38 100644
--- a/packages/plugin-google-analytics/test/cases/option-anonymous/option-anonymous.spec.js
+++ b/packages/plugin-google-analytics/test/cases/option-anonymous/option-anonymous.spec.js
@@ -49,9 +49,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js b/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js
index bb96f48e0..ef0daa1c3 100644
--- a/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-graphql/test/cases/develop.default/develop.default.spec.js
@@ -44,14 +44,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/plugin-graphql/test/cases/exp-prerender.query-children/exp-prerender.query-children.spec.js b/packages/plugin-graphql/test/cases/exp-prerender.query-children/exp-prerender.query-children.spec.js
index 79c65d350..a30c06160 100644
--- a/packages/plugin-graphql/test/cases/exp-prerender.query-children/exp-prerender.query-children.spec.js
+++ b/packages/plugin-graphql/test/cases/exp-prerender.query-children/exp-prerender.query-children.spec.js
@@ -77,12 +77,12 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@greenwood/plugin-graphql/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...greenwoodGraphqlCoreLibs,
         ...greenwoodGraphqlQueryLibs,
         ...packageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
index 2bcc15a43..91dda8bde 100644
--- a/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
+++ b/packages/plugin-graphql/test/cases/qraphql-server/graphql-server.spec.js
@@ -36,14 +36,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/plugin-graphql/test/cases/query-children/query-children.spec.js b/packages/plugin-graphql/test/cases/query-children/query-children.spec.js
index b7d108805..65df87110 100644
--- a/packages/plugin-graphql/test/cases/query-children/query-children.spec.js
+++ b/packages/plugin-graphql/test/cases/query-children/query-children.spec.js
@@ -120,7 +120,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodGraphqlCoreLibs,
         ...greenwoodGraphqlQueryLibs,
@@ -139,7 +139,7 @@ describe('Build Greenwood With: ', function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/query-config/query-config.spec.js b/packages/plugin-graphql/test/cases/query-config/query-config.spec.js
index 4a7fae0c2..a49fb5c64 100644
--- a/packages/plugin-graphql/test/cases/query-config/query-config.spec.js
+++ b/packages/plugin-graphql/test/cases/query-config/query-config.spec.js
@@ -58,12 +58,12 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@greenwood/plugin-graphql/src/queries/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodGraphqlCoreLibs,
         ...greenwoodGraphqlQueryLibs
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/query-custom-frontmatter/query-custom-frontmatter.spec.js b/packages/plugin-graphql/test/cases/query-custom-frontmatter/query-custom-frontmatter.spec.js
index d706a1fa9..c4a3a620e 100644
--- a/packages/plugin-graphql/test/cases/query-custom-frontmatter/query-custom-frontmatter.spec.js
+++ b/packages/plugin-graphql/test/cases/query-custom-frontmatter/query-custom-frontmatter.spec.js
@@ -122,7 +122,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodGraphqlCoreLibs,
         ...greenwoodGraphqlQueryLibs,
@@ -141,7 +141,7 @@ describe('Build Greenwood With: ', function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/query-custom-schema/query-custom-schema.spec.js b/packages/plugin-graphql/test/cases/query-custom-schema/query-custom-schema.spec.js
index 9505bbc70..a93cedd18 100644
--- a/packages/plugin-graphql/test/cases/query-custom-schema/query-custom-schema.spec.js
+++ b/packages/plugin-graphql/test/cases/query-custom-schema/query-custom-schema.spec.js
@@ -55,11 +55,11 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@greenwood/plugin-graphql/src/core/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodGraphqlCoreLibs
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/query-graph/query-graph.spec.js b/packages/plugin-graphql/test/cases/query-graph/query-graph.spec.js
index c1f643be8..43d20a5d0 100644
--- a/packages/plugin-graphql/test/cases/query-graph/query-graph.spec.js
+++ b/packages/plugin-graphql/test/cases/query-graph/query-graph.spec.js
@@ -118,7 +118,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodGraphqlCoreLibs,
         ...greenwoodGraphqlQueryLibs,
@@ -137,7 +137,7 @@ describe('Build Greenwood With: ', function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-graphql/test/cases/query-menu/query-menu.spec.js b/packages/plugin-graphql/test/cases/query-menu/query-menu.spec.js
index 9902ad395..ffe69c7f6 100644
--- a/packages/plugin-graphql/test/cases/query-menu/query-menu.spec.js
+++ b/packages/plugin-graphql/test/cases/query-menu/query-menu.spec.js
@@ -120,7 +120,7 @@ describe('Build Greenwood With: ', async function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...greenwoodGraphqlCoreLibs,
         ...greenwoodGraphqlQueryLibs,
@@ -139,7 +139,7 @@ describe('Build Greenwood With: ', async function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-import-commonjs/test/cases/default/default.spec.js b/packages/plugin-import-commonjs/test/cases/default/default.spec.js
index b85060b6f..05b49328a 100644
--- a/packages/plugin-import-commonjs/test/cases/default/default.spec.js
+++ b/packages/plugin-import-commonjs/test/cases/default/default.spec.js
@@ -43,7 +43,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -61,12 +61,12 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/lodash/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lodashLibs,
         ...lodashLibsPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-import-css/test/cases/default/default.spec.js b/packages/plugin-import-css/test/cases/default/default.spec.js
index 36d9e1f5c..ea53973b3 100644
--- a/packages/plugin-import-css/test/cases/default/default.spec.js
+++ b/packages/plugin-import-css/test/cases/default/default.spec.js
@@ -41,7 +41,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -49,9 +49,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js b/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
index fd893c883..75e21bc9e 100644
--- a/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-import-css/test/cases/develop.default/develop.default.spec.js
@@ -48,14 +48,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/plugin-import-css/test/cases/exp-build.prerender/exp-build.prerender.spec.js b/packages/plugin-import-css/test/cases/exp-build.prerender/exp-build.prerender.spec.js
index 8f127dacb..ff1a89771 100644
--- a/packages/plugin-import-css/test/cases/exp-build.prerender/exp-build.prerender.spec.js
+++ b/packages/plugin-import-css/test/cases/exp-build.prerender/exp-build.prerender.spec.js
@@ -45,7 +45,7 @@ describe('(Experimental) Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -53,9 +53,9 @@ describe('(Experimental) Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 85b36295e..f6a59d218 100644
--- a/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-css/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -45,7 +45,7 @@ describe('Serve Greenwood With: ', function() {
   const hostname = 'http://localhost:8080';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -56,15 +56,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/plugin-import-json/test/cases/default/default.spec.js b/packages/plugin-import-json/test/cases/default/default.spec.js
index c048e4841..fb168439a 100644
--- a/packages/plugin-import-json/test/cases/default/default.spec.js
+++ b/packages/plugin-import-json/test/cases/default/default.spec.js
@@ -43,7 +43,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -51,9 +51,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js b/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
index 0d4a11ffa..a0b298cdc 100644
--- a/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-import-json/test/cases/develop.default/develop.default.spec.js
@@ -49,14 +49,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/plugin-import-json/test/cases/exp-build.prerender/exp-build.prerender.spec.js b/packages/plugin-import-json/test/cases/exp-build.prerender/exp-build.prerender.spec.js
index 87b57e5f2..c33d8f616 100644
--- a/packages/plugin-import-json/test/cases/exp-build.prerender/exp-build.prerender.spec.js
+++ b/packages/plugin-import-json/test/cases/exp-build.prerender/exp-build.prerender.spec.js
@@ -45,7 +45,7 @@ describe('(Experimental) Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -53,9 +53,9 @@ describe('(Experimental) Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 161aa44f3..770c4c163 100644
--- a/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-import-json/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -42,7 +42,7 @@ describe('Serve Greenwood With: ', function() {
   const hostname = 'http://localhost:8080';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -53,15 +53,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/plugin-import-jsx/test/cases/default/default.prerender.spec.js b/packages/plugin-import-jsx/test/cases/default/default.prerender.spec.js
index c68aae7eb..167704f75 100644
--- a/packages/plugin-import-jsx/test/cases/default/default.prerender.spec.js
+++ b/packages/plugin-import-jsx/test/cases/default/default.prerender.spec.js
@@ -44,7 +44,7 @@ describe('(Experimental) Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -52,9 +52,9 @@ describe('(Experimental) Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/plugin-import-jsx/test/cases/exp-build.prerender/exp-build.prerender.spec.js b/packages/plugin-import-jsx/test/cases/exp-build.prerender/exp-build.prerender.spec.js
index 1031653fb..dc6914c57 100644
--- a/packages/plugin-import-jsx/test/cases/exp-build.prerender/exp-build.prerender.spec.js
+++ b/packages/plugin-import-jsx/test/cases/exp-build.prerender/exp-build.prerender.spec.js
@@ -45,7 +45,7 @@ describe('(Experimental) Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -53,9 +53,9 @@ describe('(Experimental) Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/plugin-include-html/test/cases/build.default-custom-element/build.default.custom-element.spec.js b/packages/plugin-include-html/test/cases/build.default-custom-element/build.default.custom-element.spec.js
index 407080cec..d2a9c6d3a 100644
--- a/packages/plugin-include-html/test/cases/build.default-custom-element/build.default.custom-element.spec.js
+++ b/packages/plugin-include-html/test/cases/build.default-custom-element/build.default.custom-element.spec.js
@@ -50,9 +50,9 @@ describe('Build Greenwood With HTML Include Plugin: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-include-html/test/cases/build.default-link-tag/build.default.link-tag.spec.js b/packages/plugin-include-html/test/cases/build.default-link-tag/build.default.link-tag.spec.js
index c347f79ec..357cbbc54 100644
--- a/packages/plugin-include-html/test/cases/build.default-link-tag/build.default.link-tag.spec.js
+++ b/packages/plugin-include-html/test/cases/build.default-link-tag/build.default.link-tag.spec.js
@@ -50,9 +50,9 @@ describe('Build Greenwood With HTML Include Plugin: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-polyfills/test/cases/default/default.spec.js b/packages/plugin-polyfills/test/cases/default/default.spec.js
index 253e9ec1b..6bfb2f4ad 100644
--- a/packages/plugin-polyfills/test/cases/default/default.spec.js
+++ b/packages/plugin-polyfills/test/cases/default/default.spec.js
@@ -49,7 +49,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -57,8 +57,8 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-      await runner.setup(outputPath, [...getSetupFiles(outputPath), ...expectedPolyfillFiles.map((file) => {
+    before(function() {
+      runner.setup(outputPath, [...getSetupFiles(outputPath), ...expectedPolyfillFiles.map((file) => {
         const dir = file === 'webcomponents-loader.js'
           ? 'node_modules/@webcomponents/webcomponentsjs'
           : 'node_modules/@webcomponents/webcomponentsjs/bundles';
@@ -68,7 +68,7 @@ describe('Build Greenwood With: ', function() {
           destination: `${outputPath}/${dir}/${file}`
         };
       })]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-polyfills/test/cases/dsd/dsd.spec.js b/packages/plugin-polyfills/test/cases/dsd/dsd.spec.js
index 814105ee6..a52b53537 100644
--- a/packages/plugin-polyfills/test/cases/dsd/dsd.spec.js
+++ b/packages/plugin-polyfills/test/cases/dsd/dsd.spec.js
@@ -36,7 +36,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -44,10 +44,9 @@ describe('Build Greenwood With: ', function() {
   });
 
   describe(LABEL, function() {
-    before(async function() {
-
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public'], LABEL);
diff --git a/packages/plugin-polyfills/test/cases/lit/lit.spec.js b/packages/plugin-polyfills/test/cases/lit/lit.spec.js
index 0b23f42c7..13f39990c 100644
--- a/packages/plugin-polyfills/test/cases/lit/lit.spec.js
+++ b/packages/plugin-polyfills/test/cases/lit/lit.spec.js
@@ -42,7 +42,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -110,7 +110,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit, // includes polyfill-support.js
         ...litPackageJson,
@@ -127,7 +127,7 @@ describe('Build Greenwood With: ', function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-postcss/test/cases/default/default.spec.js b/packages/plugin-postcss/test/cases/default/default.spec.js
index 69b121369..9d8d19cc2 100644
--- a/packages/plugin-postcss/test/cases/default/default.spec.js
+++ b/packages/plugin-postcss/test/cases/default/default.spec.js
@@ -41,7 +41,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -50,9 +50,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js b/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js
index b5f495012..eeaa242e6 100644
--- a/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js
+++ b/packages/plugin-postcss/test/cases/options.extend-config/options.extend-config.spec.js
@@ -57,9 +57,9 @@ describe('Build Greenwood With: ', function() {
 
   describe(LABEL, function() {
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-renderer-lit/test/cases/build.prerender.getting-started/build.prerender.getting-started.spec.js b/packages/plugin-renderer-lit/test/cases/build.prerender.getting-started/build.prerender.getting-started.spec.js
index 2ad781be2..adced6d2c 100644
--- a/packages/plugin-renderer-lit/test/cases/build.prerender.getting-started/build.prerender.getting-started.spec.js
+++ b/packages/plugin-renderer-lit/test/cases/build.prerender.getting-started/build.prerender.getting-started.spec.js
@@ -125,7 +125,7 @@ describe('Build Greenwood With Custom Lit Renderer for SSG prerendering: ', func
         `${outputPath}/node_modules/@types/trusted-types/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -143,7 +143,7 @@ describe('Build Greenwood With Custom Lit Renderer for SSG prerendering: ', func
         ...litReactiveElementPackageJson,
         ...litHtmlSourceMap
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js b/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js
index 6dd4b3ba2..b36cf230d 100644
--- a/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js
+++ b/packages/plugin-renderer-lit/test/cases/serve.default/serve.default.spec.js
@@ -40,7 +40,7 @@ describe('Serve Greenwood With: ', function() {
   const hostname = 'http://localhost:8080';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -109,7 +109,7 @@ describe('Serve Greenwood With: ', function() {
         `${outputPath}/node_modules/@lit/reactive-element/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...lit,
         ...litPackageJson,
@@ -126,14 +126,14 @@ describe('Serve Greenwood With: ', function() {
         ...litReactiveElementDecorators,
         ...litReactiveElementPackageJson
       ]);
-      await runner.runCommand(cliPath, 'build');
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/plugin-renderer-puppeteer/test/cases/build.default/build.default.spec.js b/packages/plugin-renderer-puppeteer/test/cases/build.default/build.default.spec.js
index 0738cbe20..82fe77ebc 100644
--- a/packages/plugin-renderer-puppeteer/test/cases/build.default/build.default.spec.js
+++ b/packages/plugin-renderer-puppeteer/test/cases/build.default/build.default.spec.js
@@ -175,7 +175,7 @@ describe('Build Greenwood With: ', function() {
         `${outputPath}/node_modules/prismjs/`
       );
 
-      await runner.setup(outputPath, [
+      runner.setup(outputPath, [
         ...getSetupFiles(outputPath),
         ...reduxLibs,
         ...reduxPackageJson,
@@ -208,8 +208,8 @@ describe('Build Greenwood With: ', function() {
         ...simpleCss,
         ...simpleCssPackageJson
       ]);
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-typescript/test/cases/default/default.spec.js b/packages/plugin-typescript/test/cases/default/default.spec.js
index 1bb6c63ef..1fa0c4b32 100644
--- a/packages/plugin-typescript/test/cases/default/default.spec.js
+++ b/packages/plugin-typescript/test/cases/default/default.spec.js
@@ -52,7 +52,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -62,8 +62,8 @@ describe('Build Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
     });
 
     runSmokeTest(['public', 'index'], LABEL);
diff --git a/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js b/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
index 445069b85..a21788271 100644
--- a/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
+++ b/packages/plugin-typescript/test/cases/develop.default/develop.default.spec.js
@@ -42,14 +42,14 @@ describe('Develop Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath);
+      runner.setup(outputPath);
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 5000);
 
-        await runner.runCommand(cliPath, 'develop');
+        runner.runCommand(cliPath, 'develop', { async: true });
       });
     });
 
diff --git a/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js b/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js
index dff8dbb9b..e335cc581 100644
--- a/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js
+++ b/packages/plugin-typescript/test/cases/exp-prerender.serve.ssr/exp-prerender.serve.ssr.spec.js
@@ -41,7 +41,7 @@ xdescribe('Serve Greenwood With: ', function() {
   const hostname = 'http://127.0.0.1:8080';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -52,15 +52,15 @@ xdescribe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
index 01ed288b4..f69a3880f 100644
--- a/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
+++ b/packages/plugin-typescript/test/cases/exp-serve.ssr/exp-serve.ssr.spec.js
@@ -38,7 +38,7 @@ describe('Serve Greenwood With: ', function() {
   const hostname = 'http://localhost:8080';
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public'),
       hostname
@@ -49,15 +49,15 @@ describe('Serve Greenwood With: ', function() {
   describe(LABEL, function() {
 
     before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
-      return new Promise(async (resolve) => {
+      return new Promise((resolve) => {
         setTimeout(() => {
           resolve();
         }, 10000);
 
-        await runner.runCommand(cliPath, 'serve');
+        runner.runCommand(cliPath, 'serve', { async: true });
       });
     });
 
diff --git a/packages/plugin-typescript/test/cases/options.extend-config/options.extend-config.spec.js b/packages/plugin-typescript/test/cases/options.extend-config/options.extend-config.spec.js
index 815cd9c0d..5182895df 100644
--- a/packages/plugin-typescript/test/cases/options.extend-config/options.extend-config.spec.js
+++ b/packages/plugin-typescript/test/cases/options.extend-config/options.extend-config.spec.js
@@ -52,7 +52,7 @@ describe('Build Greenwood With: ', function() {
   const outputPath = fileURLToPath(new URL('.', import.meta.url));
   let runner;
 
-  before(async function() {
+  before(function() {
     this.context = {
       publicDir: path.join(outputPath, 'public')
     };
@@ -62,9 +62,9 @@ describe('Build Greenwood With: ', function() {
   describe(LABEL, function() {
     let jsFiles;
 
-    before(async function() {
-      await runner.setup(outputPath, getSetupFiles(outputPath));
-      await runner.runCommand(cliPath, 'build');
+    before(function() {
+      runner.setup(outputPath, getSetupFiles(outputPath));
+      runner.runCommand(cliPath, 'build');
 
       jsFiles = glob.sync(path.join(this.context.publicDir, '*.js'));
     });
diff --git a/yarn.lock b/yarn.lock
index fb31fb8af..babf2cfdb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8475,10 +8475,10 @@ fuzzy@0.1.3:
   resolved "https://registry.yarnpkg.com/fuzzy/-/fuzzy-0.1.3.tgz#4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"
   integrity sha512-/gZffu4ykarLrCiP3Ygsa86UAo1E5vEVlvTrpkKywXSbP9Xhln3oSp9QSV57gEq3JFFpGJ4GZ+5zdEp3FcUh4w==
 
-gallinago@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/gallinago/-/gallinago-0.7.0.tgz#d097f66135dfb0a1b43321f8413b302d9e29e5dc"
-  integrity sha512-ZocoxNUGta4qq5N+GRZLdXo1+D0q6oHapEKOQrx+ADzfn646I59wOTMQqGIMxd0hvQWMzYtiFbn3DWyGYXzsIw==
+gallinago@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/gallinago/-/gallinago-0.8.0.tgz#b918c497b8fe05df84521c2cb4b85aac2f3fc984"
+  integrity sha512-bTAptESmUCq6OZCWKJGLQ4+vzDbKmLCrGurhgCNxMtitYaGn1dkXmUY1Gceniew/m14R8GbeizjlTC1hxJBqHA==
 
 gauge@^3.0.0:
   version "3.0.2"