diff --git a/.github/workflows/build-tool-packages.yml b/.github/workflows/build-tool-packages.yml
index c4e0a3b..fbf2cf6 100644
--- a/.github/workflows/build-tool-packages.yml
+++ b/.github/workflows/build-tool-packages.yml
@@ -1,9 +1,8 @@
 # This reusable workflow is used by actions/*-versions repositories
-# It is designed to 
+# It is designed to
 # - build and test new versions of a tool (Go, Node)
 # - publish a release with a new tool version
 # The GITHUB_TOKEN secret is used to trigger workflow runs and publish releases
-
 name: Generate tool packages
 on:
   workflow_call:
@@ -20,46 +19,57 @@ on:
         description: "Whether to publish releases"
         required: true
         type: boolean
-        
 defaults:
   run:
     shell: pwsh
-
+# Fix for windows arm64 7z file issue. More details at https://github.com/nodejs/node/issues/52231
 jobs:
   build:
     name: Build ${{ inputs.tool-name }} ${{ inputs.tool-version }} [${{ matrix.platform }}] [${{ matrix.architecture }}]
     runs-on: ubuntu-latest
-    env: 
+    env:
       ARTIFACT_NAME: ${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-${{ matrix.architecture }}
     strategy:
       fail-fast: false
       matrix:
-        platform: [linux, darwin, win32]
-        architecture: [x64, arm64]
-                   
+        include:
+        - os: ubuntu-latest
+          platform: linux
+          architecture: x64
+        - os: ubuntu-latest
+          platform: darwin
+          architecture: x64
+        - os: ubuntu-latest
+          platform: win32
+          architecture: x64
+        - os: ubuntu-latest
+          platform: win32
+          architecture: arm64
+        - os: ubuntu-latest
+          platform: linux
+          architecture: arm64
+        - os: ubuntu-latest
+          platform: darwin
+          architecture: arm64
     steps:
     - uses: actions/checkout@v4
       with:
         submodules: true
-
     - name: Build ${{ inputs.tool-name }} ${{ inputs.tool-version }}
       run: |
         ./builders/build-${{ inputs.tool-name }}.ps1 -Version ${{ inputs.tool-version }} `
                                                      -Platform ${{ matrix.platform }} `
                                                      -Architecture ${{ matrix.architecture }}
-                                                     
-
     - name: Publish artifact
       uses: actions/upload-artifact@v3
       with:
         name: ${{ env.ARTIFACT_NAME }}
         path: ${{ runner.temp }}/artifact
-
   test:
     name: Test ${{ inputs.tool-name }} ${{ inputs.tool-version }} [${{ matrix.platform }}]
     needs: build
     runs-on: ${{ matrix.os }}
-    env: 
+    env:
       ARTIFACT_NAME: ${{ inputs.tool-name }}-${{ inputs.tool-version }}-${{ matrix.platform }}-${{ matrix.arch }}
     strategy:
       fail-fast: false
@@ -68,71 +78,53 @@ jobs:
         - os: ubuntu-latest
           platform: linux
           arch: x64
-        - os: ubuntu-latest
-          platform: linux
-          arch: arm64
         - os: macos-latest
           platform: darwin
           arch: arm64
-        - os: macos-13
-          platform: darwin
-          arch: x64
         - os: windows-latest
           platform: win32
           arch: x64
-        - os: windows-latest
-          platform: win32
-          arch: arm64
-
     steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
-
     - name: Fully cleanup the toolcache directory before testing
       run: ./helpers/clean-toolcache.ps1 -ToolName "${{ inputs.tool-name }}"
-
     - name: Download artifact
       uses: actions/download-artifact@v3
       with:
         path: ${{ runner.temp }}
-
     - name: Extract files
       run: |
         if ('${{ matrix.platform }}' -eq 'win32') {
           if ('${{ inputs.tool-name }}' -eq 'node') {
             $artifactName = "${{ env.ARTIFACT_NAME }}.7z"
-          } elseif ('${{ inputs.tool-name }}' -eq 'go') {            
+          } elseif ('${{ inputs.tool-name }}' -eq 'go') {
             $artifactName = "${{ env.ARTIFACT_NAME }}.zip"
           } else {
             Write-Host "Unsupported tool - ${{ inputs.tool-name }}"
             exit 1
           }
-          
-          7z.exe x "$artifactName" -y | Out-Null 
+          7z.exe x "$artifactName" -y | Out-Null
         } else {
           $artifactName = "${{ env.ARTIFACT_NAME }}.tar.gz"
           tar -xzf $artifactName
         }
       working-directory: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
-
     - name: Apply build artifact to the local machine
       run: |
         if ('${{ matrix.platform }}' -eq 'win32') { powershell ./setup.ps1 } else { sh ./setup.sh }
       working-directory: ${{ runner.temp }}/${{ env.ARTIFACT_NAME }}
-
     - name: Setup Node.js ${{ inputs.tool-version }}
       if: inputs.tool-name == 'node'
       uses: actions/setup-node@v3
       with:
         node-version: ${{ inputs.tool-version }}
-
     - name: Setup Go ${{ inputs.tool-version }}
       if: inputs.tool-name == 'go'
       uses: actions/setup-go@v3
       with:
         go-version: ${{ inputs.tool-version }}
-
     - name: Wait for the logs
       run: |
         Write-Host "Fake step that does nothing"
@@ -140,16 +132,15 @@ jobs:
         Write-Host "In testing step we analyze build log of 'Setup ${{ inputs.tool-name }}' task"
         Write-Host "to determine if ${{ inputs.tool-name }} version was consumed from cache or if it was downloaded"
         for ($i = 0; $i -lt 200; $i++) { Get-Random }
-
     - name: Run tests
-      env: 
+      env:
         VERSION: ${{ inputs.tool-version }}
       run: |
+        Install-Module Pester -Force -Scope CurrentUser -SkipPublisherCheck
         Import-Module Pester
         $toolName = (Get-Culture).TextInfo.ToTitleCase("${{ inputs.tool-name }}")
         Invoke-Pester -Script ./$toolName.Tests.ps1 -EnableExit
       working-directory: ./tests
-
   publish_release:
     name: Publish release
     if: inputs.publish-release
@@ -157,17 +148,15 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/download-artifact@v3
-
     - name: Generate release body
       id: generate-release-body
-      run: |        
+      run: |
         if ('${{ inputs.tool-name }}' -eq 'node') {
           $releaseBody = 'Node.js ${{ inputs.tool-version }}'
         } else {
           $releaseBody = 'Go ${{ inputs.tool-version }}'
         }
         echo "RELEASE_BODY=$releaseBody" >> $env:GITHUB_OUTPUT
-
     - name: Publish Release
       id: create_release
       uses: actions/create-release@v1
@@ -178,7 +167,6 @@ jobs:
         release_name: ${{ inputs.tool-version }}
         body: |
           ${{ steps.generate-release-body.outputs.RELEASE_BODY }}
-
     - name: Generate hash for packages
       run: |
         $childItems = Get-Childitem -Path '.'
@@ -189,8 +177,7 @@ jobs:
           $hashString = "$actualHash $($packageObj.Name)"
           Write-Host "$hashString"
           Add-Content -Path ./hashes.sha256 -Value "$hashString"
-        } 
-
+        }
     - name: Upload release assets
       uses: actions/github-script@v6
       with:
@@ -199,7 +186,6 @@ jobs:
           const fs = require('fs');
           for (let artifactDir of fs.readdirSync('.')) {
             let artifactName = fs.lstatSync(artifactDir).isDirectory() ? fs.readdirSync(`${artifactDir}`)[0] : artifactDir;
-
             console.log(`Upload ${artifactName} asset`);
             github.rest.repos.uploadReleaseAsset({
               owner: context.repo.owner,
@@ -209,7 +195,6 @@ jobs:
               data: fs.lstatSync(artifactDir).isDirectory() ? fs.readFileSync(`./${artifactDir}/${artifactName}`) : fs.readFileSync(`./${artifactName}`).toString()
             });
           }
-
   trigger_pr:
     name: Trigger "Create Pull Request" workflow
     needs: publish_release
@@ -225,4 +210,4 @@ jobs:
             repo: context.repo.repo,
             workflow_id: 'create-pr.yml',
             ref: 'main'
-          });
+          });
\ No newline at end of file