diff --git a/.github/workflows/build_macos.yml b/.github/workflows/build_macos.yml
index 0ebacb2..c9da1b9 100644
--- a/.github/workflows/build_macos.yml
+++ b/.github/workflows/build_macos.yml
@@ -68,7 +68,7 @@ jobs:
           name: "Python wheel"
 
       - name: Install wheel
-        run: pip install --find-links=${{github.workspace}} raidionicsmaps-*
+        run: pip install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-*
         shell: bash
 
       - name: Test CLI
@@ -79,5 +79,3 @@ jobs:
 
       - name: Heatmap computation unit test
         run: cd ${{github.workspace}}/tests && python heatmap_generation_test.py
-
-
diff --git a/.github/workflows/build_macos_arm.yml b/.github/workflows/build_macos_arm.yml
index 61b4f21..e482d0f 100644
--- a/.github/workflows/build_macos_arm.yml
+++ b/.github/workflows/build_macos_arm.yml
@@ -1,18 +1,30 @@
 name: Build macOS ARM
 
 on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [master, release]
   workflow_dispatch:
 
+env:
+  MACOSX_DEPLOYMENT_TARGET: 11.0
+
 jobs:
   build:
-    name: Build RADS lib on MacOS ARM
-    runs-on: self-hosted
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        include:
+          - os: macos-14
+            TARGET: macos
+            CMD_BUILD: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64
 
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies
-        run: |
-          arch -arm64 brew reinstall zlib
+        run: arch -arm64 brew reinstall zlib
 
       - name: Setup pyenv
         env:
@@ -25,14 +37,14 @@ jobs:
           PKG_CONFIG_PATH: "/usr/local/opt/zlib/lib/pkgconfig"
         uses: "gabrielfalcao/pyenv-action@v13"
         with:
-            default: 3.7
+            default: "3.8"
             command: pip3 install -U pip3 wheel setuptools
 
       - name: Collect submodules
         uses: actions/checkout@v3
         with:
           submodules: 'recursive'
-
+      
       - name: Download ANTs
         uses: robinraju/release-downloader@main
         with:
@@ -43,12 +55,13 @@ jobs:
 
       - name: Extract ANTs
         run: |
+          mkdir -p ${{github.workspace}}/raidionicsrads/ANTs/
           cd ${{github.workspace}}/downloads/
           tar -xzf ANTsX-v2.4.3_macos_arm.tar.gz -C ${{github.workspace}}/downloads/
           mv ${{github.workspace}}/downloads/install ${{github.workspace}}/raidionicsrads/ANTs/
 
-      - name: Building wheel for macOS ARM
-        run: python3 setup.py bdist_wheel --plat-name macosx_11_0_arm64
+      - name: Built wheel for ${{matrix.TARGET}}
+        run: ${{matrix.CMD_BUILD}}
 
       - name: Upload Python wheel
         uses: actions/upload-artifact@v3
@@ -61,14 +74,16 @@ jobs:
     needs: build
     strategy:
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
-    runs-on: self-hosted
+        os: [ macos-14 ]
+        python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
+    runs-on: ${{ matrix.os }}
 
     steps:
-      - name: Setup pyenv for Python ${{ matrix.python-version }}
+      - name: Set up pyenv using Python ${{ matrix.python-version }}
         uses: "gabrielfalcao/pyenv-action@v13"
         with:
-          default: ${{ matrix.python-version }}
+            default: ${{ matrix.python-version }}
+            command: pip3 install -U pip3 wheel setuptools
 
       - name: Download artifact
         uses: actions/download-artifact@v3
@@ -76,15 +91,14 @@ jobs:
           name: "Python wheel"
 
       - name: Install wheel
-        run: pip3 install --force-reinstall --find-links=${{github.workspace}} raidionicsmaps-*
+        run: pip3 install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-*
         shell: bash
 
       - name: Test CLI
-        run: python3 -m raidionicsmaps --help
+        run: raidionicsmaps --help
 
       - name: Clone repo
         uses: actions/checkout@v1
 
       - name: Heatmap computation unit test
         run: cd ${{github.workspace}}/tests && python3 heatmap_generation_test.py
-
diff --git a/.github/workflows/build_ubuntu.yml b/.github/workflows/build_ubuntu.yml
index 34bfebb..ab16752 100644
--- a/.github/workflows/build_ubuntu.yml
+++ b/.github/workflows/build_ubuntu.yml
@@ -64,7 +64,7 @@ jobs:
           name: "Python wheel"
 
       - name: Install wheel
-        run: pip install --find-links=${{github.workspace}} raidionicsmaps-*
+        run: pip install --default-timeout=100 --find-links=${{github.workspace}} raidionicsmaps-*
         shell: bash
 
       - name: Test CLI
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 5538c19..166770b 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -64,7 +64,7 @@ jobs:
           name: "Python wheel"
 
       - name: Install wheel
-        run: pip install --find-links=. raidionicsmaps-*
+        run: pip install --default-timeout=100 --find-links=. raidionicsmaps-*
         shell: bash
 
       - name: Test CLI
diff --git a/requirements.txt b/requirements.txt
index 6d316bf..6c381ea 100644
Binary files a/requirements.txt and b/requirements.txt differ
diff --git a/tests/heatmap_generation_test.py b/tests/heatmap_generation_test.py
index 471123d..e687e21 100644
--- a/tests/heatmap_generation_test.py
+++ b/tests/heatmap_generation_test.py
@@ -1,5 +1,4 @@
 import os
-import json
 import shutil
 import configparser
 import logging