diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 04639c096..6545e722b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -20,7 +20,16 @@ jobs:
     secrets: inherit
     strategy:
       matrix:
-        os: [ubuntu-latest, windows-latest]
+        os: [ubuntu-20-8core, windows-2022-16core]
+        command:
+          - 'yarn test:nuts:deploy:metadata:manifest'
+          - 'yarn test:nuts:deploy:metadata:metadata-dir'
+          - 'yarn test:nuts:deploy:metadata:metadata'
+          - 'yarn test:nuts:deploy:metadata:source-dir'
+          - 'yarn test:nuts:deploy:metadata:test-level'
+          - 'yarn test:nuts:static'
+          - 'yarn test:nuts:tracking'
       fail-fast: false
     with:
       os: ${{ matrix.os }}
+      command: ${{ matrix.command }}
diff --git a/src/commands/deploy.ts b/src/commands/deploy.ts
index ffe8218c8..fb854c224 100644
--- a/src/commands/deploy.ts
+++ b/src/commands/deploy.ts
@@ -7,11 +7,19 @@
 /* eslint-disable class-methods-use-this */
 
 import { EOL } from 'os';
-import { Flags, Hook } from '@oclif/core';
+import { Hook } from '@oclif/core';
 import { Messages } from '@salesforce/core';
 import { writeJson, pathExists, writeFile, readFile } from 'fs-extra';
 import { Env, parseJsonMap } from '@salesforce/kit';
-import { Deployable, Deployer, generateTableChoices, Prompter, SfCommand, SfHook } from '@salesforce/sf-plugins-core';
+import {
+  Deployable,
+  Deployer,
+  generateTableChoices,
+  Prompter,
+  SfCommand,
+  SfHook,
+  Flags,
+} from '@salesforce/sf-plugins-core';
 import { exec } from 'shelljs';
 import { DeployerResult } from '@salesforce/sf-plugins-core/lib/deployer';