diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index f97b120..da940e1 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -17,6 +17,12 @@ jobs:
       - run: pip install -r requirements.txt
       - run: pip install -r dev-requirements.txt
 
+      - name: Test All Python
+        run: python3 -m pytest .
+
+      - name: Check Python Types
+        run: pyright .
+
       - name: Install Core
         run: poetry install
         working-directory: ./libs/core
@@ -25,21 +31,10 @@ jobs:
         run: poetry build
         working-directory: ./libs/core
 
-      - name: Test Core
-        run: python3 -m pytest tests/
-        working-directory: ./libs/core
-
       # Remove this later: needed as server expects this dir to exist
       - name: Mock Studio Web UI
         run: mkdir -p ./app/web_ui/build
 
-      - name: Test Studio
-        run: python3 -m pytest tests/
-        working-directory: ./libs/studio
-
       - name: Build Studio
         run: poetry build
         working-directory: ./libs/studio
-
-      - name: Check Python Types
-        run: pyright .