diff --git a/.github/workflows/tests_macos.yml b/.github/workflows/test.yml
similarity index 83%
rename from .github/workflows/tests_macos.yml
rename to .github/workflows/test.yml
index f372d61b..538a1cc9 100644
--- a/.github/workflows/tests_macos.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: macOS
+name: tests
 
 on:
   push:
@@ -19,13 +19,15 @@ jobs:
     strategy:
       matrix:
         python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        os: ["macos-latest", "windows-latest", "ubuntu-latest"]
 
       fail-fast: false
 
-    runs-on: macos-latest
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 30
 
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v4
 
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
@@ -42,4 +44,3 @@ jobs:
       - name: Test with pytest
         run: |
           python -m pytest tests --cov=hyperactive --cov-report=term-missing --cov-report=xml -p no:warnings
-          
\ No newline at end of file
diff --git a/.github/workflows/tests_ubuntu.yml b/.github/workflows/tests_ubuntu.yml
deleted file mode 100644
index 2483cdfd..00000000
--- a/.github/workflows/tests_ubuntu.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-name: Ubuntu
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-    branches:
-      - master
-      - dev
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-        numpy-pandas-version: [">=1.0, <2.0", ">=2.0, <3.0"]
-        exclude:
-          - python-version: "3.13"
-            numpy-pandas-version: ">=1.0, <2.0"
-            
-      fail-fast: false
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install build
-
-          make install-all-extras
-
-          python -m pip install "numpy ${{ matrix.numpy-pandas-version }}"
-          python -m pip install "pandas ${{ matrix.numpy-pandas-version }}"
-
-      - name: Lint with flake8
-        run: |
-          # stop the build if there are Python syntax errors or undefined names
-          flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
-          # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-          flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
-
-      - name: Test with pytest
-        run: |
-          python -m pytest tests --cov=hyperactive --cov-report=term-missing --cov-report=xml -p no:warnings
-          
-      - name: Coverage Summary Report
-        uses:  irongut/CodeCoverageSummary@v1.3.0
-        with:
-          filename: coverage.xml
-          badge: true
\ No newline at end of file
diff --git a/.github/workflows/tests_windows.yml b/.github/workflows/tests_windows.yml
deleted file mode 100644
index 1530f6ff..00000000
--- a/.github/workflows/tests_windows.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Windows
-
-on:
-  push:
-    branches:
-      - master
-      - dev
-  pull_request:
-    branches:
-      - master
-      - dev
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  build:
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
-
-      fail-fast: false
-
-    runs-on: windows-latest
-
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v5
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          python -m pip install build
-
-          make install-all-extras
-
-      - name: Test with pytest
-        run: |
-          python -m pytest tests --cov=hyperactive --cov-report=term-missing --cov-report=xml -p no:warnings