diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..8b4cf8b
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,11 @@
+# Summary
+
+{FIXME}
+
+# Details
+
+{FIXME}
+
+# Changes in action
+
+{FIXME}
diff --git a/.github/workflows/always.yml b/.github/workflows/always.yml
index 667c516..0b8d62c 100644
--- a/.github/workflows/always.yml
+++ b/.github/workflows/always.yml
@@ -13,16 +13,26 @@ jobs:
       - name: id
         id: id
         run: echo "BUILD_ID=$(date +%s)" >> $GITHUB_ENV
+
       - name: echo
         run: echo ${{ env.BUILD_ID }}
 
+
   test:
+    name: npm test
     needs: id
-    uses: percebus/github-actions-npm/.github/workflows/npm_test.yml@main
-    with:
-      reporter: jest-junit
-      list-tests: all
-      files_pattern: junit.xml
+    runs-on: ubuntu-latest
+    steps:
+      - uses: percebus/github-actions-common/.github/actions/checkout@main
+      - uses: percebus/github-actions-node/.github/actions/node_setup@main
+      - uses: percebus/github-actions-npm/.github/actions/npm_install@main
+
+      - name: npm test
+        run: npm test
+      - uses: percebus/github-actions-testing/.github/actions/junit@main
+        with:
+          list-tests: all
+
 
   testem:
     if: false # FIXME not working
@@ -52,7 +62,7 @@ jobs:
           - 23
         os:
           - ubuntu-latest
-#         - macOS-latest # FIXME
+          - macOS-latest
           - windows-latest
 
     runs-on: ${{ matrix.os }}
@@ -67,10 +77,8 @@ jobs:
 
       - name: npm test
         run: npm test
-      - uses: percebus/github-actions-testing/.github/actions/test-reporter@main
+      - uses: percebus/github-actions-testing/.github/actions/junit@main
         with:
-          name: Unit Tests @ node:${{ matrix.node }}@${{ matrix.os }}
-          reporter: jest-junit
-          files_pattern: junit.xml
-          list-suites: all
-          list-tests: failed
+          tests_name: Unit Tests @ node:${{ matrix.node }}@${{ matrix.os }}
+          summary_title: ""
+          publish-test-deltas: "false"
diff --git a/TODO.md b/TODO.md
index 13ba29b..b369f83 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,7 +2,7 @@
 
 ## TODOs
 
-- [ ] Consolidate `unit.spec.es6.js` with `unit.spec.js` tests
+- [x] ~~Consolidate `unit.spec.es6.js` with `unit.spec.js` tests~~
 - [ ] Stop using TODO.md and use "Issues" instead.
 
 ### Prettier