diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index fd95c77..ab9b314 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -8,34 +8,20 @@ jobs:
       - uses: actions/checkout@v2
         with:
           path: repo
-          
+      
       - name: Checkout pcb-versions repo
         uses: actions/checkout@v3
         with:
           repository: RaccoonLabHardware/pcb-versions
           token: ${{ secrets.ACCESS_TOKEN }}
-          path: repo/pcb-versions
+          path: repo/scripts/pcb-versions
 
-      - name: Check that all needed files exists (test-files-exists.py)
-        run: |
-          cd repo && python pcb-versions/test-files-exists.py
-
-      - name: Generate dict BOMList from BOM file
-        run: |
-          cd repo && pip install openpyxl && python pcb-versions/test-generateBOM.py
-
-      - name: Check Version Resistors is correct if exists (test-versions.py)
-        run: |
-          cd repo && python pcb-versions/test-versions.py
-
-      - name: Check Manufacturer Partnumber (test-wrong-MP.py)
-        run: |
-          cd repo && python pcb-versions/test-wrong-MP.py
-
-      - name: Check that all BOM components contains in 'pick and place' (test-BOM-PNP.py)
-        run: |
-          cd repo && pip install pandas && python pcb-versions/test-BOM-PNP.py      
+      - name: Checkout pcb-tools repo
+        uses: actions/checkout@v3
+        with:
+          repository: sainquake/pcb-tools
+          path: repo/scripts/pcb-tools
 
-      - name: All other tests that can be added in future
+      - name: pcb-tools-test
         run: |
-          cd repo && pip install steputils && python pcb-versions/test-other.py
\ No newline at end of file
+          cd repo && pip install pytest && pytest -v
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index ae2cd0f..e1789ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,4 @@ Status Report.Txt
 *.htm
 *.html
 ~*
-pcb-versions/
 paths.json
diff --git a/.gitmodules b/.gitmodules
index 94d99a5..0f69f57 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "scripts/pcb-tools"]
 	path = scripts/pcb-tools
 	url = https://github.com/sainquake/pcb-tools
+[submodule "scripts/pcb-versions"]
+	path = scripts/pcb-versions
+	url = https://github.com/RaccoonLabHardware/pcb-versions.git
diff --git a/Project Outputs/BOM/Bill of Materials-BOM.xlsx b/Project Outputs/BOM/Bill of Materials-BOM.xlsx
index c802572..5094a70 100644
Binary files a/Project Outputs/BOM/Bill of Materials-BOM.xlsx and b/Project Outputs/BOM/Bill of Materials-BOM.xlsx differ
diff --git a/scripts/pcb-tools b/scripts/pcb-tools
index 9112e1a..e4766c6 160000
--- a/scripts/pcb-tools
+++ b/scripts/pcb-tools
@@ -1 +1 @@
-Subproject commit 9112e1ab7c36ef7a4df6414872d9de25ec4737a3
+Subproject commit e4766c61286c8db12b49c8ae32101331d3d5b462
diff --git a/scripts/pcb-versions b/scripts/pcb-versions
new file mode 160000
index 0000000..99fbd7a
--- /dev/null
+++ b/scripts/pcb-versions
@@ -0,0 +1 @@
+Subproject commit 99fbd7ad99f72b953fbfed55ddfb2b063cc5847b