diff --git a/.github/workflows/docsgen.yml b/.github/workflows/docsgen.yml
index 627aeba..435a0d0 100644
--- a/.github/workflows/docsgen.yml
+++ b/.github/workflows/docsgen.yml
@@ -33,15 +33,14 @@ jobs:
         wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
+        echo "::add-matcher::.github/openscad_docsgen.json"
 
     - name: Generating Docs Headless
       uses: GabrielBB/xvfb-action@v1
       with:
         working-directory: $GITHUB_WORKSPACE
         run: |
-          export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
-          echo "::add-matcher::.github/openscad_docsgen.json"
-          openscad-docsgen -ticmI *.scad
+          OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) openscad-docsgen -ticmI *.scad
 
     - name: Commit Wiki Docs
       run: |
diff --git a/.github/workflows/forced_docsgen.yml b/.github/workflows/forced_docsgen.yml
index cc318f0..51aa1c0 100644
--- a/.github/workflows/forced_docsgen.yml
+++ b/.github/workflows/forced_docsgen.yml
@@ -31,15 +31,14 @@ jobs:
         wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
+        echo "::add-matcher::.github/openscad_docsgen.json"
 
     - name: Generating Docs Headless
       uses: GabrielBB/xvfb-action@v1
       with:
         working-directory: $GITHUB_WORKSPACE
         run: |
-          export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
-          echo "::add-matcher::.github/openscad_docsgen.json"
-          openscad-docsgen -ticmIf *.scad
+          OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) openscad-docsgen -ticmIf *.scad
 
     - name: Commit Wiki Docs
       run: |
diff --git a/.github/workflows/testwf.yml b/.github/workflows/testwf.yml
index a6d5774..6af9c4a 100644
--- a/.github/workflows/testwf.yml
+++ b/.github/workflows/testwf.yml
@@ -31,15 +31,17 @@ jobs:
         wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage
         sudo mv OpenSCAD-2021.01*-x86_64.AppImage /usr/local/bin/openscad
         sudo chmod +x /usr/local/bin/openscad
+        echo "::add-matcher::.github/openscad_docsgen.json"
+
+    - name: Make SCAD File
+      run: |
+        cd $GITHUB_WORKSPACE
+        echo "cube(50, center=100);" > testwf.scad
 
     - name: TestScript
       uses: GabrielBB/xvfb-action@v1
       with:
         working-directory: $GITHUB_WORKSPACE
         run: |
-          cd $GITHUB_WORKSPACE
-          export OPENSCADPATH=$(dirname $GITHUB_WORKSPACE)
-          echo "::add-matcher::.github/openscad_docsgen.json"
-          echo "cube(50, center=100);" > testwf.scad
-          openscad -o tmp_cube.png --imgsize=640,480 --view=axes,scales --projection=o --autocenter --viewall --preview '' --hardwarnings testwf.scad
+          OPENSCADPATH=$(dirname $GITHUB_WORKSPACE) openscad -o tmp_cube.png --imgsize=640,480 --view=axes,scales --projection=o --autocenter --viewall --preview '' --hardwarnings testwf.scad