From 377e97148d427b72c4badc5baa105350ab513bac Mon Sep 17 00:00:00 2001
From: Liam Bigelow <40188355+bglw@users.noreply.github.com>
Date: Tue, 17 Dec 2024 14:23:33 +1300
Subject: [PATCH 1/3] Update Toolproof to latest, adapt Toolproof macros

---
 .github/workflows/release.yml                       |  2 +-
 .github/workflows/test.yml                          |  2 +-
 CONTRIBUTING.md                                     |  2 +-
 .../_macros/node.toolproof.macro.yml                |  3 +++
 .../_macros/python.toolproof.macro.yml              |  3 +++
 .../_macros/run.toolproof.macro.yml                 |  3 +++
 .../_macros/run_with_flags.toolproof.macro.yml      |  3 +++
 .../anchors/background.toolproof.yml                |  2 +-
 .../anchors_example/background.toolproof.yml        |  2 +-
 ...oad-indexes-then-search-for-a-word.toolproof.yml |  2 +-
 .../base/return-all-results.toolproof.yml           |  2 +-
 .../base/search-for-a-word.toolproof.yml            |  2 +-
 ...ionary-file-glob-can-be-configured.toolproof.yml |  2 +-
 .../file-glob-can-be-configured.toolproof.yml       |  2 +-
 ...-can-be-configured-relative-to-cwd.toolproof.yml |  2 +-
 ...e-configured-with-an-absolute-path.toolproof.yml |  4 +---
 .../output-path-can-be-configured.toolproof.yml     |  2 +-
 .../root-selector-can-be-configured.toolproof.yml   |  2 +-
 .../source-folder-can-be-configured.toolproof.yml   |  2 +-
 ...can-search-for-a-hyphenated-phrase.toolproof.yml |  2 +-
 ...-queries-that-normalize-to-nothing.toolproof.yml |  2 +-
 ...-match-html-entities-as-their-text.toolproof.yml |  2 +-
 ...find-handles-html-entities-in-meta.toolproof.yml |  2 +-
 .../characters/pagefind-matches-emoji.toolproof.yml |  2 +-
 ...agefind-matches-special-characters.toolproof.yml |  2 +-
 ...ompound-words-are-indexed-per-word.toolproof.yml |  2 +-
 .../compound_filtering/background.toolproof.yml     |  2 +-
 ...-be-pulled-from-command-line-flags.toolproof.yml |  2 +-
 ...-pulled-from-environment-variables.toolproof.yml |  2 +-
 ...lled-from-json-configuration-files.toolproof.yml |  2 +-
 ...an-be-pulled-from-multiple-sources.toolproof.yml |  2 +-
 ...lled-from-toml-configuration-files.toolproof.yml |  2 +-
 ...lled-from-yaml-configuration-files.toolproof.yml |  4 ++--
 .../debounce-repeated-search-calls.toolproof.yml    |  2 +-
 .../debounce/debounce-with-options.toolproof.yml    |  2 +-
 ...chors-do-not-leak-through-metadata.toolproof.yml |  2 +-
 ...esn-t-error-on-parsing-ambiguities.toolproof.yml |  2 +-
 ...t-outside-of-the-main-html-element.toolproof.yml |  2 +-
 ...spaces-in-segmented-language-pages.toolproof.yml |  2 +-
 .../pagefind-multilingual-sub-results.toolproof.yml |  2 +-
 ...couraged-across-element-boundaries.toolproof.yml |  2 +-
 ...ll-return-pages-with-exact-matches.toolproof.yml |  2 +-
 ...ctors-can-be-excluded-as-an-option.toolproof.yml |  2 +-
 ...xcluded-from-indexing-and-excerpts.toolproof.yml |  2 +-
 ...lements-are-excluded-automatically.toolproof.yml |  2 +-
 ...de-ignored-elements-can-be-ignored.toolproof.yml |  2 +-
 .../filtering/background.toolproof.yml              |  2 +-
 ...oad-indexes-then-search-for-a-word.toolproof.yml |  2 +-
 .../base/legacy-search-for-a-word.toolproof.yml     |  2 +-
 ...ionary-file-glob-can-be-configured.toolproof.yml |  2 +-
 ...legacy-file-glob-can-be-configured.toolproof.yml |  2 +-
 ...e-configured-with-an-absolute-path.toolproof.yml |  4 +---
 ...gacy-output-path-can-be-configured.toolproof.yml |  2 +-
 ...cy-root-selector-can-be-configured.toolproof.yml |  2 +-
 ...cy-source-folder-can-be-configured.toolproof.yml |  2 +-
 ...-be-pulled-from-command-line-flags.toolproof.yml |  2 +-
 ...-pulled-from-environment-variables.toolproof.yml |  2 +-
 ...lled-from-json-configuration-files.toolproof.yml |  2 +-
 ...an-be-pulled-from-multiple-sources.toolproof.yml |  2 +-
 ...lled-from-toml-configuration-files.toolproof.yml |  2 +-
 ...lled-from-yaml-configuration-files.toolproof.yml |  2 +-
 .../legacy-pagefind-modular-ui-loads.toolproof.yml  |  2 +-
 ...egacy-pagefind-modular-ui-searches.toolproof.yml |  2 +-
 ...red-to-lump-all-languages-together.toolproof.yml |  8 ++++----
 ...y-pagefind-keeps-dialects-separate.toolproof.yml |  8 ++++----
 ...anguages-into-the-primary-language.toolproof.yml |  4 ++--
 ...-for-english-with-english-stemming.toolproof.yml |  2 +-
 ...ortuguese-with-portuguese-stemming.toolproof.yml |  2 +-
 ...unknown-languages-with-no-stemming.toolproof.yml |  6 +++---
 ...d-can-search-across-multiple-sites.toolproof.yml |  4 ++--
 ...i-can-search-across-multiple-sites.toolproof.yml |  4 ++--
 .../legacy-cli-tests-are-working.toolproof.yml      |  2 +-
 ...-the-default-directory-being-moved.toolproof.yml |  2 +-
 .../legacy-base-url-can-be-configured.toolproof.yml |  2 +-
 ...y-keep-index-url-can-be-configured.toolproof.yml |  2 +-
 .../ui_base/legacy-pagefind-ui-loads.toolproof.yml  |  2 +-
 .../legacy-pagefind-ui-searches.toolproof.yml       |  2 +-
 .../highlighting_results/background.toolproof.yml   |  2 +-
 ...rs-are-inserted-through-the-js-api.toolproof.yml |  2 +-
 ...can-be-inserted-through-the-js-api.toolproof.yml |  2 +-
 ...-t-conflict-with-subresult-anchors.toolproof.yml |  2 +-
 ...-chunk-will-load-the-closest-chunk.toolproof.yml |  2 +-
 .../html-attributes-can-be-indexed.toolproof.yml    |  2 +-
 ...-can-be-limited-to-a-given-element.toolproof.yml |  2 +-
 .../index-gzipped-input-files.toolproof.yml         |  2 +-
 .../metadata/background.toolproof.yml               |  2 +-
 .../pagefind-modular-ui-loads.toolproof.yml         |  2 +-
 .../pagefind-modular-ui-searches.toolproof.yml      |  2 +-
 ...red-to-lump-all-languages-together.toolproof.yml |  8 ++++----
 ...an-be-destroyed-and-re-initialized.toolproof.yml |  2 +-
 .../pagefind-keeps-dialects-separate.toolproof.yml  |  8 ++++----
 ...anguages-into-the-primary-language.toolproof.yml |  2 +-
 ...-for-english-with-english-stemming.toolproof.yml |  2 +-
 ...ortuguese-with-portuguese-stemming.toolproof.yml |  2 +-
 ...unknown-languages-with-no-stemming.toolproof.yml |  2 +-
 ...can-search-across-discrete-domains.toolproof.yml |  2 +-
 ...search-across-multiple-basic-sites.toolproof.yml |  4 ++--
 ...can-search-across-discrete-domains.toolproof.yml |  2 +-
 ...i-can-search-across-multiple-sites.toolproof.yml |  4 ++--
 .../multisite_filters/background.toolproof.yml      |  4 ++--
 ...-of-merged-indexes-can-be-selected.toolproof.yml |  4 ++--
 ...ame-language-across-multiple-sites.toolproof.yml |  4 ++--
 ...indexes-can-be-weighted-separately.toolproof.yml |  4 ++--
 ...re-scored-correctly-across-indexes.toolproof.yml |  4 ++--
 .../an-index-is-not-consumed-on-write.toolproof.yml |  4 +---
 .../node_api/node_base/background.toolproof.yml     |  2 +-
 ...lended-index-to-memory-via-the-api.toolproof.yml |  4 +---
 ...ynthetic-index-to-disk-via-the-api.toolproof.yml |  4 +---
 ...thetic-index-to-memory-via-the-api.toolproof.yml |  4 +---
 ...verridden-urls-to-disk-via-the-api.toolproof.yml |  4 +---
 ...d-a-true-index-to-disk-via-the-api.toolproof.yml |  4 +---
 ...a-custom-disk-location-via-the-api.toolproof.yml |  4 +---
 .../close-the-pagefind-backend.toolproof.yml        |  4 +---
 ...uage-takes-precedence-over-records.toolproof.yml |  4 +---
 ...agefind-empty-index-returns-assets.toolproof.yml |  4 +---
 .../node_base/pagefind-error-handling.toolproof.yml |  4 +---
 .../node_base/pagefind-service-config.toolproof.yml |  4 +---
 ...-pages-that-match---out-of---words.toolproof.yml |  2 +-
 ...-an-index-is-not-consumed-on-write.toolproof.yml |  4 ++--
 ...lended-index-to-memory-via-the-api.toolproof.yml |  4 ++--
 ...ynthetic-index-to-disk-via-the-api.toolproof.yml |  4 ++--
 ...thetic-index-to-memory-via-the-api.toolproof.yml |  4 ++--
 ...verridden-urls-to-disk-via-the-api.toolproof.yml |  4 ++--
 ...d-a-true-index-to-disk-via-the-api.toolproof.yml |  4 ++--
 ...a-custom-disk-location-via-the-api.toolproof.yml |  4 ++--
 .../py-close-the-pagefind-backend.toolproof.yml     |  4 ++--
 ...uage-takes-precedence-over-records.toolproof.yml |  4 ++--
 ...agefind-empty-index-returns-assets.toolproof.yml |  4 ++--
 .../py-pagefind-error-handling.toolproof.yml        |  4 ++--
 .../py-pagefind-service-config.toolproof.yml        |  4 ++--
 .../sanity/cli-tests-are-working.toolproof.yml      |  2 +-
 ...e-length-ranking-can-be-configured.toolproof.yml |  2 +-
 ...ncy-vs-raw-count-can-be-configured.toolproof.yml |  2 +-
 .../term-saturation-can-be-configured.toolproof.yml |  2 +-
 ...milarity-ranking-can-be-configured.toolproof.yml |  2 +-
 .../scoring_defaults/background.toolproof.yml       |  2 +-
 ...-the-default-directory-being-moved.toolproof.yml |  2 +-
 .../base-url-can-be-configured.toolproof.yml        |  2 +-
 .../keep-index-url-can-be-configured.toolproof.yml  |  4 +---
 ...-join-inline-elements-as-sentences.toolproof.yml |  2 +-
 ...gnores-redundant-zero-width-spaces.toolproof.yml |  2 +-
 ...-joins-block-elements-as-sentences.toolproof.yml |  2 +-
 .../pagefind-treats-br-tags-as-spaces.toolproof.yml |  2 +-
 .../sorting/background.toolproof.yml                |  2 +-
 .../search-is-case-independent.toolproof.yml        |  2 +-
 .../search-is-punctuation-independent.toolproof.yml |  2 +-
 ...atch-against-the-stem-of-that-word.toolproof.yml |  2 +-
 ...-backtrack-a-word-to-find-a-prefix.toolproof.yml |  2 +-
 ...ll-backtrack-a-word-to-find-a-stem.toolproof.yml |  2 +-
 ...ned-for-all-extensions-of-the-word.toolproof.yml |  2 +-
 ...ind-ui-can-programmatically-filter.toolproof.yml |  2 +-
 .../ui/ui_base/pagefind-ui-loads.toolproof.yml      |  2 +-
 .../ui/ui_base/pagefind-ui-searches.toolproof.yml   |  2 +-
 ...ind-ui-adds-highlight-query-params.toolproof.yml |  2 +-
 ...-highlight-query-params-by-default.toolproof.yml |  2 +-
 ...-custom-highlight-query-param-name.toolproof.yml |  2 +-
 ...-provide-a-hook-to-process-results.toolproof.yml |  2 +-
 ...ide-a-hook-to-process-search-terms.toolproof.yml |  2 +-
 .../pagefind-ui-can-customize-scoring.toolproof.yml |  2 +-
 ...nd-ui-can-load-custom-translations.toolproof.yml |  2 +-
 ...nd-ui-loads-automatic-translations.toolproof.yml |  2 +-
 .../integration_tests/urls/background.toolproof.yml |  2 +-
 .../urls/tag-pages-as-external-urls.toolproof.yml   |  4 +---
 ...ords-are-implicitly-weighted-lower.toolproof.yml |  2 +-
 ...-as-full-words-use-the-full-weight.toolproof.yml |  2 +-
 ...efixes-prioritise-the-lower-weight.toolproof.yml |  2 +-
 ...ompound-words-sum-to-a-full-weight.toolproof.yml |  2 +-
 ...ically-favoured-over-standard-text.toolproof.yml |  2 +-
 ...-can-be-explicitly-weighted-higher.toolproof.yml |  2 +-
 ...t-can-be-explicitly-weighted-lower.toolproof.yml |  2 +-
 test_ci.sh                                          |  9 ---------
 test_interactive.sh                                 | 13 -------------
 toolproof.yml                                       | 10 ++++++++++
 173 files changed, 225 insertions(+), 257 deletions(-)
 create mode 100644 pagefind/integration_tests/_macros/node.toolproof.macro.yml
 create mode 100644 pagefind/integration_tests/_macros/python.toolproof.macro.yml
 create mode 100644 pagefind/integration_tests/_macros/run.toolproof.macro.yml
 create mode 100644 pagefind/integration_tests/_macros/run_with_flags.toolproof.macro.yml
 delete mode 100755 test_ci.sh
 delete mode 100755 test_interactive.sh
 create mode 100644 toolproof.yml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 27de7d2c..94db97fe 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -537,7 +537,7 @@ jobs:
 
       - name: Test CLI
         if: matrix.run_tests == true
-        run: ./test_ci.sh "${{ matrix.target }}/release"
+        run: npx -y toolproof@latest -s --placeholders pagefind_mode="${{ matrix.target }}/release"
 
       - name: Move extended binary aside
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 15f54e70..6b6967ab 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -117,7 +117,7 @@ jobs:
         run: cargo test --release --lib --features extended
 
       - name: Test CLI
-        run: ./test_ci.sh "release"
+        run: npx -y toolproof@latest -s
 
       - name: Set up poetry
         run: ./wrappers/python/scripts/ci/github/setup_poetry.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d8ca0628..2859d2f7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -68,7 +68,7 @@ After building, you'll have a final Pagefind binary at `target/release/pagefind`
 
 ## Test suite
 
-To run the integration test suite, from the root folder run `./test_interactive.sh`.
+To run the integration test suite, from the root folder run `npx toolproof@latest`.
 This will give you a terminal interface to run tests and accept snapshot changes.
 
 From the `pagefind` directory you can run `cargo test` for unit tests.
diff --git a/pagefind/integration_tests/_macros/node.toolproof.macro.yml b/pagefind/integration_tests/_macros/node.toolproof.macro.yml
new file mode 100644
index 00000000..12da3d06
--- /dev/null
+++ b/pagefind/integration_tests/_macros/node.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind Node as {file} in {dir}
+steps:
+  - I run "cd %dir% && npm i && PAGEFIND_BINARY_PATH=%toolproof_process_directory%/target/%pagefind_mode%/pagefind node %file%"
diff --git a/pagefind/integration_tests/_macros/python.toolproof.macro.yml b/pagefind/integration_tests/_macros/python.toolproof.macro.yml
new file mode 100644
index 00000000..09a8e237
--- /dev/null
+++ b/pagefind/integration_tests/_macros/python.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind Python as {file} in {dir}
+steps:
+  - I run "cd %dir% && PAGEFIND_BINARY_PATH=%toolproof_process_directory%/target/%pagefind_mode%/pagefind python3 %file%"
diff --git a/pagefind/integration_tests/_macros/run.toolproof.macro.yml b/pagefind/integration_tests/_macros/run.toolproof.macro.yml
new file mode 100644
index 00000000..70b6b562
--- /dev/null
+++ b/pagefind/integration_tests/_macros/run.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind
+steps:
+  - I run "%toolproof_process_directory%/target/%pagefind_mode%/pagefind"
diff --git a/pagefind/integration_tests/_macros/run_with_flags.toolproof.macro.yml b/pagefind/integration_tests/_macros/run_with_flags.toolproof.macro.yml
new file mode 100644
index 00000000..271d4536
--- /dev/null
+++ b/pagefind/integration_tests/_macros/run_with_flags.toolproof.macro.yml
@@ -0,0 +1,3 @@
+macro: I run Pagefind with {flags}
+steps:
+  - I run "%toolproof_process_directory%/target/%pagefind_mode%/pagefind %flags%"
diff --git a/pagefind/integration_tests/anchors/background.toolproof.yml b/pagefind/integration_tests/anchors/background.toolproof.yml
index cda81841..3fd7b6b4 100644
--- a/pagefind/integration_tests/anchors/background.toolproof.yml
+++ b/pagefind/integration_tests/anchors/background.toolproof.yml
@@ -51,7 +51,7 @@ steps:
       <!DOCTYPE html><html lang="en"><head></head><body><div data-pagefind-body>
           <h1 id="repr-heading">My <span data-pagefind-ignore>Redacted</span> Heading about Symbiosis</h1>
       </div></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/anchors_example/background.toolproof.yml b/pagefind/integration_tests/anchors_example/background.toolproof.yml
index 83a06723..ddf91167 100644
--- a/pagefind/integration_tests/anchors_example/background.toolproof.yml
+++ b/pagefind/integration_tests/anchors_example/background.toolproof.yml
@@ -25,7 +25,7 @@ steps:
           <h2 id="building-from-source">Building from source</h2>
           <p>You can run <code class="inline">cargo install pagefind</code> to build from source.</p>
       </main></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/base/preload-indexes-then-search-for-a-word.toolproof.yml b/pagefind/integration_tests/base/preload-indexes-then-search-for-a-word.toolproof.yml
index ab7f4469..8680f18d 100644
--- a/pagefind/integration_tests/base/preload-indexes-then-search-for-a-word.toolproof.yml
+++ b/pagefind/integration_tests/base/preload-indexes-then-search-for-a-word.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/base/return-all-results.toolproof.yml b/pagefind/integration_tests/base/return-all-results.toolproof.yml
index 1251e774..95f73c34 100644
--- a/pagefind/integration_tests/base/return-all-results.toolproof.yml
+++ b/pagefind/integration_tests/base/return-all-results.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/base/search-for-a-word.toolproof.yml b/pagefind/integration_tests/base/search-for-a-word.toolproof.yml
index 9c733e85..ed48dcfc 100644
--- a/pagefind/integration_tests/base/search-for-a-word.toolproof.yml
+++ b/pagefind/integration_tests/base/search-for-a-word.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/build_options/complex-exclusionary-file-glob-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/complex-exclusionary-file-glob-can-be-configured.toolproof.yml
index 51f5b296..b7a565d2 100644
--- a/pagefind/integration_tests/build_options/complex-exclusionary-file-glob-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/build_options/complex-exclusionary-file-glob-can-be-configured.toolproof.yml
@@ -23,7 +23,7 @@ steps:
       lang="en"><head></head><body><h1>cat</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'glob: "{cat/index.htm,kitty/**/*.html,cat.html}"'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/build_options/file-glob-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/file-glob-can-be-configured.toolproof.yml
index 9fa45bf3..7b1cd044 100644
--- a/pagefind/integration_tests/build_options/file-glob-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/build_options/file-glob-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
       lang="en"><head></head><body><h1>world</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'glob: "**/*.{htm,html}"'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/build_options/output-path-can-be-configured-relative-to-cwd.toolproof.yml b/pagefind/integration_tests/build_options/output-path-can-be-configured-relative-to-cwd.toolproof.yml
index 2d875509..d3ee2a6e 100644
--- a/pagefind/integration_tests/build_options/output-path-can-be-configured-relative-to-cwd.toolproof.yml
+++ b/pagefind/integration_tests/build_options/output-path-can-be-configured-relative-to-cwd.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --output-path misc/_search"
+  - macro: I run Pagefind with "--output-path misc/_search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "misc/_search/pagefind.js" should not be empty
   - step: I serve the directory "."
diff --git a/pagefind/integration_tests/build_options/output-path-can-be-configured-with-an-absolute-path.toolproof.yml b/pagefind/integration_tests/build_options/output-path-can-be-configured-with-an-absolute-path.toolproof.yml
index 05fa3d16..f143d273 100644
--- a/pagefind/integration_tests/build_options/output-path-can-be-configured-with-an-absolute-path.toolproof.yml
+++ b/pagefind/integration_tests/build_options/output-path-can-be-configured-with-an-absolute-path.toolproof.yml
@@ -10,9 +10,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: >-
-      I run "%pagefind_exec_path% --output-subdir
-      %toolproof_test_directory%/other/_search"
+  - macro: I run Pagefind with "--output-subdir %toolproof_test_directory%/other/_search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "other/_search/pagefind.js" should not be empty
   - step: I serve the directory "."
diff --git a/pagefind/integration_tests/build_options/output-path-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/output-path-can-be-configured.toolproof.yml
index a84a7661..07732520 100644
--- a/pagefind/integration_tests/build_options/output-path-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/build_options/output-path-can-be-configured.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --output-subdir _search"
+  - macro: I run Pagefind with "--output-subdir _search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/_search/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/build_options/root-selector-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/root-selector-can-be-configured.toolproof.yml
index cdef9375..37cd264b 100644
--- a/pagefind/integration_tests/build_options/root-selector-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/build_options/root-selector-can-be-configured.toolproof.yml
@@ -12,7 +12,7 @@ steps:
           <h1>Hello</h1>
       </div>
       <p data-pagefind-meta="ignored">Also ignored</p></body></html>
-  - step: I run "%pagefind_exec_path% --root-selector 'body > .content'"
+  - macro: I run Pagefind with "--root-selector 'body > .content'"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/build_options/source-folder-can-be-configured.toolproof.yml b/pagefind/integration_tests/build_options/source-folder-can-be-configured.toolproof.yml
index 717452bd..45266536 100644
--- a/pagefind/integration_tests/build_options/source-folder-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/build_options/source-folder-can-be-configured.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --site my_website"
+  - macro: I run Pagefind with "--site my_website"
   - step: stdout should contain "Running Pagefind"
   - step: The file "my_website/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "my_website"
diff --git a/pagefind/integration_tests/characters/pagefind-can-search-for-a-hyphenated-phrase.toolproof.yml b/pagefind/integration_tests/characters/pagefind-can-search-for-a-hyphenated-phrase.toolproof.yml
index bcb9afc2..4f817295 100644
--- a/pagefind/integration_tests/characters/pagefind-can-search-for-a-hyphenated-phrase.toolproof.yml
+++ b/pagefind/integration_tests/characters/pagefind-can-search-for-a-hyphenated-phrase.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>The
       beet-root</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/characters/pagefind-does-not-return-results-for-queries-that-normalize-to-nothing.toolproof.yml b/pagefind/integration_tests/characters/pagefind-does-not-return-results-for-queries-that-normalize-to-nothing.toolproof.yml
index 7b617b34..36640563 100644
--- a/pagefind/integration_tests/characters/pagefind-does-not-return-results-for-queries-that-normalize-to-nothing.toolproof.yml
+++ b/pagefind/integration_tests/characters/pagefind-does-not-return-results-for-queries-that-normalize-to-nothing.toolproof.yml
@@ -7,7 +7,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>Invert can before
       opening</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/characters/pagefind-doesn-t-match-html-entities-as-their-text.toolproof.yml b/pagefind/integration_tests/characters/pagefind-doesn-t-match-html-entities-as-their-text.toolproof.yml
index e974bf0f..55cb6dc3 100644
--- a/pagefind/integration_tests/characters/pagefind-doesn-t-match-html-entities-as-their-text.toolproof.yml
+++ b/pagefind/integration_tests/characters/pagefind-doesn-t-match-html-entities-as-their-text.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>The
       &quot;bees&quot;</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/characters/pagefind-handles-html-entities-in-meta.toolproof.yml b/pagefind/integration_tests/characters/pagefind-handles-html-entities-in-meta.toolproof.yml
index a3f32503..e6deec1e 100644
--- a/pagefind/integration_tests/characters/pagefind-handles-html-entities-in-meta.toolproof.yml
+++ b/pagefind/integration_tests/characters/pagefind-handles-html-entities-in-meta.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1
       data-pagefind-meta="title">The &quot;bees&quot;</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/characters/pagefind-matches-emoji.toolproof.yml b/pagefind/integration_tests/characters/pagefind-matches-emoji.toolproof.yml
index 82f31f64..dc40e9c9 100644
--- a/pagefind/integration_tests/characters/pagefind-matches-emoji.toolproof.yml
+++ b/pagefind/integration_tests/characters/pagefind-matches-emoji.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>F👨‍👩‍👧‍👦am</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/characters/pagefind-matches-special-characters.toolproof.yml b/pagefind/integration_tests/characters/pagefind-matches-special-characters.toolproof.yml
index ff96476a..d5d02512 100644
--- a/pagefind/integration_tests/characters/pagefind-matches-special-characters.toolproof.yml
+++ b/pagefind/integration_tests/characters/pagefind-matches-special-characters.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Béës</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/characters/punctuated-compound-words-are-indexed-per-word.toolproof.yml b/pagefind/integration_tests/characters/punctuated-compound-words-are-indexed-per-word.toolproof.yml
index 8c57d516..aba55a8b 100644
--- a/pagefind/integration_tests/characters/punctuated-compound-words-are-indexed-per-word.toolproof.yml
+++ b/pagefind/integration_tests/characters/punctuated-compound-words-are-indexed-per-word.toolproof.yml
@@ -25,7 +25,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><p>Cloud,Cannon</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/compound_filtering/background.toolproof.yml b/pagefind/integration_tests/compound_filtering/background.toolproof.yml
index f273dcca..dfd05355 100644
--- a/pagefind/integration_tests/compound_filtering/background.toolproof.yml
+++ b/pagefind/integration_tests/compound_filtering/background.toolproof.yml
@@ -62,7 +62,7 @@ steps:
       <span data-pagefind-filter="color">Orange</span>
 
       <h1>Cat</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-command-line-flags.toolproof.yml b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-command-line-flags.toolproof.yml
index 2acb1c5a..87edfd1f 100644
--- a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-command-line-flags.toolproof.yml
+++ b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-command-line-flags.toolproof.yml
@@ -4,6 +4,6 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
-  - step: I run "%pagefind_exec_path% --site public"
+  - macro: I run Pagefind with "--site public"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-environment-variables.toolproof.yml b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-environment-variables.toolproof.yml
index e756d198..02825bf1 100644
--- a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-environment-variables.toolproof.yml
+++ b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-environment-variables.toolproof.yml
@@ -5,6 +5,6 @@ steps:
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
   - step: I have the environment variable "PAGEFIND_SITE" set to "public"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-json-configuration-files.toolproof.yml b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-json-configuration-files.toolproof.yml
index 95a211a1..01501018 100644
--- a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-json-configuration-files.toolproof.yml
+++ b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-json-configuration-files.toolproof.yml
@@ -9,6 +9,6 @@ steps:
       {
           "site": "public"
       }
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-multiple-sources.toolproof.yml b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-multiple-sources.toolproof.yml
index b8d59622..274a5f84 100644
--- a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-multiple-sources.toolproof.yml
+++ b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-multiple-sources.toolproof.yml
@@ -9,6 +9,6 @@ steps:
       {
           "site": "public"
       }
-  - step: I run "%pagefind_exec_path% --output-subdir _out"
+  - macro: I run Pagefind with "--output-subdir _out"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/_out/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-toml-configuration-files.toolproof.yml b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
index 32a1615c..061632a3 100644
--- a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
+++ b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
@@ -6,6 +6,6 @@ steps:
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
   - step: I have a "pagefind.toml" file with the content {toml}
     toml: site = "public"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
index 05496339..1b551fc9 100644
--- a/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
+++ b/pagefind/integration_tests/config_sources/settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
@@ -5,7 +5,7 @@ steps:
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>Hello.</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
-    yml: 'site: public'
-  - step: I run "%pagefind_exec_path%"
+    yml: "site: public"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/debounce/debounce-repeated-search-calls.toolproof.yml b/pagefind/integration_tests/debounce/debounce-repeated-search-calls.toolproof.yml
index 5c81e832..e8fe5366 100644
--- a/pagefind/integration_tests/debounce/debounce-repeated-search-calls.toolproof.yml
+++ b/pagefind/integration_tests/debounce/debounce-repeated-search-calls.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/debounce/debounce-with-options.toolproof.yml b/pagefind/integration_tests/debounce/debounce-with-options.toolproof.yml
index 3b38cf34..d8ea834b 100644
--- a/pagefind/integration_tests/debounce/debounce-with-options.toolproof.yml
+++ b/pagefind/integration_tests/debounce/debounce-with-options.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/edge_cases/anchors-do-not-leak-through-metadata.toolproof.yml b/pagefind/integration_tests/edge_cases/anchors-do-not-leak-through-metadata.toolproof.yml
index fe0682e5..c10ee861 100644
--- a/pagefind/integration_tests/edge_cases/anchors-do-not-leak-through-metadata.toolproof.yml
+++ b/pagefind/integration_tests/edge_cases/anchors-do-not-leak-through-metadata.toolproof.yml
@@ -31,7 +31,7 @@ steps:
           </p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/edge_cases/pagefind-doesn-t-error-on-parsing-ambiguities.toolproof.yml b/pagefind/integration_tests/edge_cases/pagefind-doesn-t-error-on-parsing-ambiguities.toolproof.yml
index 643167c7..97f064ae 100644
--- a/pagefind/integration_tests/edge_cases/pagefind-doesn-t-error-on-parsing-ambiguities.toolproof.yml
+++ b/pagefind/integration_tests/edge_cases/pagefind-doesn-t-error-on-parsing-ambiguities.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>hello world</h1>
       <select><xmp><script>"use strict";</script></select></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/edge_cases/pagefind-finds-a-data-pagefind-body-when-elements-sit-outside-of-the-main-html-element.toolproof.yml b/pagefind/integration_tests/edge_cases/pagefind-finds-a-data-pagefind-body-when-elements-sit-outside-of-the-main-html-element.toolproof.yml
index cbc32c69..99e176ad 100644
--- a/pagefind/integration_tests/edge_cases/pagefind-finds-a-data-pagefind-body-when-elements-sit-outside-of-the-main-html-element.toolproof.yml
+++ b/pagefind/integration_tests/edge_cases/pagefind-finds-a-data-pagefind-body-when-elements-sit-outside-of-the-main-html-element.toolproof.yml
@@ -21,7 +21,7 @@ steps:
       </html>
 
       <script></script>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stdout should contain "Found a data-pagefind-body element on the site"
   - step: The file "public/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/edge_cases/pagefind-handles-non-breaking-spaces-in-segmented-language-pages.toolproof.yml b/pagefind/integration_tests/edge_cases/pagefind-handles-non-breaking-spaces-in-segmented-language-pages.toolproof.yml
index aac503de..4267031e 100644
--- a/pagefind/integration_tests/edge_cases/pagefind-handles-non-breaking-spaces-in-segmented-language-pages.toolproof.yml
+++ b/pagefind/integration_tests/edge_cases/pagefind-handles-non-breaking-spaces-in-segmented-language-pages.toolproof.yml
@@ -19,7 +19,7 @@ steps:
           <p>Hello&nbsp;👋</p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/edge_cases/pagefind-multilingual-sub-results.toolproof.yml b/pagefind/integration_tests/edge_cases/pagefind-multilingual-sub-results.toolproof.yml
index 6605b45a..5521353c 100644
--- a/pagefind/integration_tests/edge_cases/pagefind-multilingual-sub-results.toolproof.yml
+++ b/pagefind/integration_tests/edge_cases/pagefind-multilingual-sub-results.toolproof.yml
@@ -24,7 +24,7 @@ steps:
           <p>بیرون نه می‌روی از من</p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/exact_phrase/exact-matches-will-be-discouraged-across-element-boundaries.toolproof.yml b/pagefind/integration_tests/exact_phrase/exact-matches-will-be-discouraged-across-element-boundaries.toolproof.yml
index fc4670b4..6fd9f3dc 100644
--- a/pagefind/integration_tests/exact_phrase/exact-matches-will-be-discouraged-across-element-boundaries.toolproof.yml
+++ b/pagefind/integration_tests/exact_phrase/exact-matches-will-be-discouraged-across-element-boundaries.toolproof.yml
@@ -14,7 +14,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>Happy post about
       cats</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/exact_phrase/searching-in-quotes-will-return-pages-with-exact-matches.toolproof.yml b/pagefind/integration_tests/exact_phrase/searching-in-quotes-will-return-pages-with-exact-matches.toolproof.yml
index 6329c1c7..7e220a75 100644
--- a/pagefind/integration_tests/exact_phrase/searching-in-quotes-will-return-pages-with-exact-matches.toolproof.yml
+++ b/pagefind/integration_tests/exact_phrase/searching-in-quotes-will-return-pages-with-exact-matches.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>A post about how
       cats do not like dogs</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/exclusions/custom-selectors-can-be-excluded-as-an-option.toolproof.yml b/pagefind/integration_tests/exclusions/custom-selectors-can-be-excluded-as-an-option.toolproof.yml
index 9c9f85d8..91660ce8 100644
--- a/pagefind/integration_tests/exclusions/custom-selectors-can-be-excluded-as-an-option.toolproof.yml
+++ b/pagefind/integration_tests/exclusions/custom-selectors-can-be-excluded-as-an-option.toolproof.yml
@@ -23,7 +23,7 @@ steps:
       exclude_selectors:
         - '[id^="g"]'
         - 'div > div'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/exclusions/elements-within-search-regions-can-be-excluded-from-indexing-and-excerpts.toolproof.yml b/pagefind/integration_tests/exclusions/elements-within-search-regions-can-be-excluded-from-indexing-and-excerpts.toolproof.yml
index 8ba7e60d..9295da04 100644
--- a/pagefind/integration_tests/exclusions/elements-within-search-regions-can-be-excluded-from-indexing-and-excerpts.toolproof.yml
+++ b/pagefind/integration_tests/exclusions/elements-within-search-regions-can-be-excluded-from-indexing-and-excerpts.toolproof.yml
@@ -21,7 +21,7 @@ steps:
       </div>
 
       <p>Huzzah!</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/exclusions/some-elements-are-excluded-automatically.toolproof.yml b/pagefind/integration_tests/exclusions/some-elements-are-excluded-automatically.toolproof.yml
index c9f0a8a1..a15e6f6a 100644
--- a/pagefind/integration_tests/exclusions/some-elements-are-excluded-automatically.toolproof.yml
+++ b/pagefind/integration_tests/exclusions/some-elements-are-excluded-automatically.toolproof.yml
@@ -24,7 +24,7 @@ steps:
       <p>Hooray!</p>
 
       <style> * { color: red; } </style></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/exclusions/tagged-elements-inside-ignored-elements-can-be-ignored.toolproof.yml b/pagefind/integration_tests/exclusions/tagged-elements-inside-ignored-elements-can-be-ignored.toolproof.yml
index 1bb95819..c12f2905 100644
--- a/pagefind/integration_tests/exclusions/tagged-elements-inside-ignored-elements-can-be-ignored.toolproof.yml
+++ b/pagefind/integration_tests/exclusions/tagged-elements-inside-ignored-elements-can-be-ignored.toolproof.yml
@@ -21,7 +21,7 @@ steps:
       <div data-pagefind-ignore="all">
           <p data-pagefind-meta="all">Nested content</p>
       </div></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/filtering/background.toolproof.yml b/pagefind/integration_tests/filtering/background.toolproof.yml
index 0e8c8298..ec6cc8be 100644
--- a/pagefind/integration_tests/filtering/background.toolproof.yml
+++ b/pagefind/integration_tests/filtering/background.toolproof.yml
@@ -26,7 +26,7 @@ steps:
       data-pagefind-filter="mood">Angry</span>
 
       <h1 data-pagefind-filter="color:Tabby">Ali Cat</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/base/legacy-preload-indexes-then-search-for-a-word.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/base/legacy-preload-indexes-then-search-for-a-word.toolproof.yml
index 57530eda..4f648710 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/base/legacy-preload-indexes-then-search-for-a-word.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/base/legacy-preload-indexes-then-search-for-a-word.toolproof.yml
@@ -7,7 +7,7 @@ steps:
       rel="pre-1.0-signal" href="_pagefind" >
 
       <h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/base/legacy-search-for-a-word.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/base/legacy-search-for-a-word.toolproof.yml
index 27485c57..a926df4d 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/base/legacy-search-for-a-word.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/base/legacy-search-for-a-word.toolproof.yml
@@ -7,7 +7,7 @@ steps:
       rel="pre-1.0-signal" href="_pagefind" >
 
       <h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-complex-exclusionary-file-glob-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-complex-exclusionary-file-glob-can-be-configured.toolproof.yml
index 4be103f2..c281ff11 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-complex-exclusionary-file-glob-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-complex-exclusionary-file-glob-can-be-configured.toolproof.yml
@@ -25,7 +25,7 @@ steps:
       lang="en"><head></head><body><h1>cat</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'glob: "{cat/index.htm,kitty/**/*.html,cat.html}"'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-file-glob-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-file-glob-can-be-configured.toolproof.yml
index e300cbf4..9fa38c61 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-file-glob-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-file-glob-can-be-configured.toolproof.yml
@@ -13,7 +13,7 @@ steps:
       lang="en"><head></head><body><h1>world</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'glob: "**/*.{htm,html}"'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured-with-an-absolute-path.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured-with-an-absolute-path.toolproof.yml
index 8eda45a8..11caf564 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured-with-an-absolute-path.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured-with-an-absolute-path.toolproof.yml
@@ -12,9 +12,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: >-
-      I run "%pagefind_exec_path% --bundle-dir
-      %toolproof_test_directory%/other/_search"
+  - macro: I run Pagefind with "--bundle-dir %toolproof_test_directory%/other/_search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "other/_search/pagefind.js" should not be empty
   - step: I serve the directory "."
diff --git a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured.toolproof.yml
index 7098e291..41253dbf 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-output-path-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --bundle-dir _search"
+  - macro: I run Pagefind with "--bundle-dir _search"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/_search/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-root-selector-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-root-selector-can-be-configured.toolproof.yml
index 44742a9b..fa0026ee 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-root-selector-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-root-selector-can-be-configured.toolproof.yml
@@ -14,7 +14,7 @@ steps:
           <h1>Hello</h1>
       </div>
       <p data-pagefind-meta="ignored">Also ignored</p></body></html>
-  - step: I run "%pagefind_exec_path% --root-selector 'body > .content'"
+  - macro: I run Pagefind with "--root-selector 'body > .content'"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-source-folder-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-source-folder-can-be-configured.toolproof.yml
index 04ca6bf5..8f06233a 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-source-folder-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/build_options/legacy-source-folder-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --source my_website"
+  - macro: I run Pagefind with "--source my_website"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "my_website/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-command-line-flags.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-command-line-flags.toolproof.yml
index da6f9e65..5aee82cc 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-command-line-flags.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-command-line-flags.toolproof.yml
@@ -6,7 +6,7 @@ steps:
       rel="pre-1.0-signal" href="_pagefind" >
 
       <h1>Hello.</h1></body></html>
-  - step: I run "%pagefind_exec_path% --source public"
+  - macro: I run Pagefind with "--source public"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-environment-variables.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-environment-variables.toolproof.yml
index e4cd6b49..8bfb1680 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-environment-variables.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-environment-variables.toolproof.yml
@@ -7,7 +7,7 @@ steps:
 
       <h1>Hello.</h1></body></html>
   - step: I have the environment variable "PAGEFIND_SOURCE" set to "public"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-json-configuration-files.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-json-configuration-files.toolproof.yml
index 6d19aaf6..9243c949 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-json-configuration-files.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-json-configuration-files.toolproof.yml
@@ -11,7 +11,7 @@ steps:
       {
           "source": "public"
       }
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-multiple-sources.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-multiple-sources.toolproof.yml
index 8f03f313..3a2e9f2b 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-multiple-sources.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-multiple-sources.toolproof.yml
@@ -11,6 +11,6 @@ steps:
       {
           "source": "public"
       }
-  - step: I run "%pagefind_exec_path% --bundle-dir _out"
+  - macro: I run Pagefind with "--bundle-dir _out"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/_out/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-toml-configuration-files.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
index 241e3b2d..0e87dee3 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-toml-configuration-files.toolproof.yml
@@ -8,7 +8,7 @@ steps:
       <h1>Hello.</h1></body></html>
   - step: I have a "pagefind.toml" file with the content {toml}
     toml: source = "public"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
index 96cbec4b..63fbf0d4 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/config_sources/legacy-settings-can-be-pulled-from-yaml-configuration-files.toolproof.yml
@@ -8,7 +8,7 @@ steps:
       <h1>Hello.</h1></body></html>
   - step: I have a "pagefind.yml" file with the content {yml}
     yml: 'source: public'
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-loads.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-loads.toolproof.yml
index 55d750f6..3ae3c4fa 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-loads.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-loads.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-searches.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-searches.toolproof.yml
index 4bc80891..8c4c769e 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-searches.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/modular_ui/modular_ui_base/legacy-pagefind-modular-ui-searches.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml
index 81f8160b..1cb2a0d8 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml
@@ -14,16 +14,16 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path% --force-language 'en'"
+  - macro: I run Pagefind with "--force-language 'en'"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/_pagefind/wasm.unknown.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/_pagefind/wasm.en.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/_pagefind/wasm.pt-br.pagefind" and expect it to fail
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
   - step: In my browser, I evaluate {js}
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-keeps-dialects-separate.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-keeps-dialects-separate.toolproof.yml
index 6bb73c81..4c79fadb 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-keeps-dialects-separate.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-keeps-dialects-separate.toolproof.yml
@@ -23,16 +23,16 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/_pagefind/wasm.unknown.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/_pagefind/wasm.pt-pt.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/_pagefind/wasm.pt-br.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: The file "public/_pagefind/pagefind-entry.json" should contain "pt-pt"
   - step: The file "public/_pagefind/pagefind-entry.json" should contain "pt-br"
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml
index 069d4181..9242fe58 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml
@@ -25,12 +25,12 @@ steps:
               <p>I am a mystery document</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/_pagefind/wasm.unknown.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: >-
       The file "public/_pagefind/pagefind-entry.json" should not contain
       "unknown"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-english-with-english-stemming.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-english-with-english-stemming.toolproof.yml
index 62553dbd..ea6e3c44 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-english-with-english-stemming.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-english-with-english-stemming.toolproof.yml
@@ -13,7 +13,7 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml
index 77958a97..fb8ba33a 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml
@@ -14,7 +14,7 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml
index c5da53ca..61d92713 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multilingual/legacy-pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml
@@ -23,16 +23,16 @@ steps:
               <p>I am a documentation</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/_pagefind/wasm.unknown.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: >-
       I run "ls -lh public/_pagefind/wasm.my_cool_language.pagefind" and expect
       it to fail
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: >-
       The file "public/_pagefind/pagefind-entry.json" should contain
       "my_cool_language"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-can-search-across-multiple-sites.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-can-search-across-multiple-sites.toolproof.yml
index 3b1a9344..0b0a6e52 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-can-search-across-multiple-sites.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-can-search-across-multiple-sites.toolproof.yml
@@ -1,11 +1,11 @@
 name: Multisite Search > LEGACY Pagefind can search across multiple sites
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --source root/website_a"
+  - macro: I run Pagefind with "--source root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "root/website_a/_pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --source root/website_b"
+  - macro: I run Pagefind with "--source root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "root/website_b/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-ui-can-search-across-multiple-sites.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-ui-can-search-across-multiple-sites.toolproof.yml
index b55ddb08..95ff2adf 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-ui-can-search-across-multiple-sites.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/multisite/multisite_base/legacy-pagefind-ui-can-search-across-multiple-sites.toolproof.yml
@@ -5,11 +5,11 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><div id="search"></div>
       <script src="/website_a/_pagefind/pagefind-ui.js"></script></body></html>
-  - step: I run "%pagefind_exec_path% --source root/website_a"
+  - macro: I run Pagefind with "--source root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "root/website_a/_pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --source root/website_b"
+  - macro: I run Pagefind with "--source root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "root/website_b/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/sanity/legacy-cli-tests-are-working.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/sanity/legacy-cli-tests-are-working.toolproof.yml
index f1e105cf..83dc8a04 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/sanity/legacy-cli-tests-are-working.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/sanity/legacy-cli-tests-are-working.toolproof.yml
@@ -5,7 +5,7 @@ steps:
       <!DOCTYPE html><html lang="en"><head></head><body>  <link
       rel="pre-1.0-signal" href="_pagefind" >
         <p data-url>Nothing</p></body></html>
-  - step: I run "%pagefind_exec_path% --source public"
+  - macro: I run Pagefind with "--source public"
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: stderr should contain "The `source` option is deprecated"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-auto-detects-the-default-directory-being-moved.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-auto-detects-the-default-directory-being-moved.toolproof.yml
index 7b224d92..7b36f6af 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-auto-detects-the-default-directory-being-moved.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-auto-detects-the-default-directory-being-moved.toolproof.yml
@@ -13,7 +13,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --bundle-dir blog/_pagefind"
+  - macro: I run Pagefind with "--bundle-dir blog/_pagefind"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/blog/_pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-can-be-configured.toolproof.yml
index e859d774..d740b21c 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-base-url-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-keep-index-url-can-be-configured.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-keep-index-url-can-be-configured.toolproof.yml
index 4c28af1a..be7e1169 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-keep-index-url-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/search_options/legacy-keep-index-url-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --bundle-dir blog/_pagefind --keep-index-url"
+  - macro: I run Pagefind with "--bundle-dir blog/_pagefind --keep-index-url"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/blog/_pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-loads.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-loads.toolproof.yml
index d9768bf2..8a06097a 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-loads.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-loads.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-searches.toolproof.yml b/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-searches.toolproof.yml
index 2cf3604f..ef36f14d 100644
--- a/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-searches.toolproof.yml
+++ b/pagefind/integration_tests/frozen-pre-1.0/ui/ui_base/legacy-pagefind-ui-searches.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: stderr should contain "pre-1.0 compatibility mode"
   - step: The file "public/_pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/highlighting/highlighting_results/background.toolproof.yml b/pagefind/integration_tests/highlighting/highlighting_results/background.toolproof.yml
index 16ed2520..f530bc2c 100644
--- a/pagefind/integration_tests/highlighting/highlighting_results/background.toolproof.yml
+++ b/pagefind/integration_tests/highlighting/highlighting_results/background.toolproof.yml
@@ -78,6 +78,6 @@ steps:
                   }
           });
       </script></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/highlighting/highlighting_search/multiple-query-parameters-are-inserted-through-the-js-api.toolproof.yml b/pagefind/integration_tests/highlighting/highlighting_search/multiple-query-parameters-are-inserted-through-the-js-api.toolproof.yml
index 05ba82c6..add3db0e 100644
--- a/pagefind/integration_tests/highlighting/highlighting_search/multiple-query-parameters-are-inserted-through-the-js-api.toolproof.yml
+++ b/pagefind/integration_tests/highlighting/highlighting_search/multiple-query-parameters-are-inserted-through-the-js-api.toolproof.yml
@@ -3,7 +3,7 @@ name: >-
   JS API
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-can-be-inserted-through-the-js-api.toolproof.yml b/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-can-be-inserted-through-the-js-api.toolproof.yml
index 105ce881..c0978176 100644
--- a/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-can-be-inserted-through-the-js-api.toolproof.yml
+++ b/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-can-be-inserted-through-the-js-api.toolproof.yml
@@ -3,7 +3,7 @@ name: >-
   API
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-don-t-conflict-with-subresult-anchors.toolproof.yml b/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-don-t-conflict-with-subresult-anchors.toolproof.yml
index f691f7e9..897f676d 100644
--- a/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-don-t-conflict-with-subresult-anchors.toolproof.yml
+++ b/pagefind/integration_tests/highlighting/highlighting_search/query-parameters-don-t-conflict-with-subresult-anchors.toolproof.yml
@@ -3,7 +3,7 @@ name: >-
   anchors
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/index_chunking/searches-that-don-t-match-a-chunk-will-load-the-closest-chunk.toolproof.yml b/pagefind/integration_tests/index_chunking/searches-that-don-t-match-a-chunk-will-load-the-closest-chunk.toolproof.yml
index 739cc341..402981fc 100644
--- a/pagefind/integration_tests/index_chunking/searches-that-don-t-match-a-chunk-will-load-the-closest-chunk.toolproof.yml
+++ b/pagefind/integration_tests/index_chunking/searches-that-don-t-match-a-chunk-will-load-the-closest-chunk.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>Hello
       World</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/indexing/html-attributes-can-be-indexed.toolproof.yml b/pagefind/integration_tests/indexing/html-attributes-can-be-indexed.toolproof.yml
index 78c7cedb..9927fd16 100644
--- a/pagefind/integration_tests/indexing/html-attributes-can-be-indexed.toolproof.yml
+++ b/pagefind/integration_tests/indexing/html-attributes-can-be-indexed.toolproof.yml
@@ -13,7 +13,7 @@ steps:
       />
 
       <p>Hello World, from Pagefind</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/indexing/indexing-can-be-limited-to-a-given-element.toolproof.yml b/pagefind/integration_tests/indexing/indexing-can-be-limited-to-a-given-element.toolproof.yml
index 64e25349..01ae2125 100644
--- a/pagefind/integration_tests/indexing/indexing-can-be-limited-to-a-given-element.toolproof.yml
+++ b/pagefind/integration_tests/indexing/indexing-can-be-limited-to-a-given-element.toolproof.yml
@@ -27,7 +27,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>No selector</h1>
       <p>goodbye content</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/input_quirks/index-gzipped-input-files.toolproof.yml b/pagefind/integration_tests/input_quirks/index-gzipped-input-files.toolproof.yml
index b2b5a0cd..e34a4629 100644
--- a/pagefind/integration_tests/input_quirks/index-gzipped-input-files.toolproof.yml
+++ b/pagefind/integration_tests/input_quirks/index-gzipped-input-files.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: >-
       I run "gzip public/cat/index.html && mv public/cat/index.html.gz
       public/cat/index.html"
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/metadata/background.toolproof.yml b/pagefind/integration_tests/metadata/background.toolproof.yml
index aed7e555..d0f8552b 100644
--- a/pagefind/integration_tests/metadata/background.toolproof.yml
+++ b/pagefind/integration_tests/metadata/background.toolproof.yml
@@ -63,7 +63,7 @@ steps:
           <p>NZ Kaka Post.</p>
       </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-loads.toolproof.yml b/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-loads.toolproof.yml
index 60355979..994fafff 100644
--- a/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-loads.toolproof.yml
+++ b/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-loads.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-searches.toolproof.yml b/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-searches.toolproof.yml
index 05c0c731..0c5f76cf 100644
--- a/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-searches.toolproof.yml
+++ b/pagefind/integration_tests/modular_ui/modular_ui_base/pagefind-modular-ui-searches.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/multilingual/pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml
index b5751b6c..3c10a8b2 100644
--- a/pagefind/integration_tests/multilingual/pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-can-be-configured-to-lump-all-languages-together.toolproof.yml
@@ -12,15 +12,15 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path% --force-language 'en'"
+  - macro: I run Pagefind with "--force-language 'en'"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/pagefind/wasm.en.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/pagefind/wasm.pt-br.pagefind" and expect it to fail
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
   - step: In my browser, I evaluate {js}
diff --git a/pagefind/integration_tests/multilingual/pagefind-can-be-destroyed-and-re-initialized.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-can-be-destroyed-and-re-initialized.toolproof.yml
index 3b09a802..f8cfaa2f 100644
--- a/pagefind/integration_tests/multilingual/pagefind-can-be-destroyed-and-re-initialized.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-can-be-destroyed-and-re-initialized.toolproof.yml
@@ -13,7 +13,7 @@ steps:
               <p data-result-b>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/multilingual/pagefind-keeps-dialects-separate.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-keeps-dialects-separate.toolproof.yml
index fe7c6c4e..ac3a30c9 100644
--- a/pagefind/integration_tests/multilingual/pagefind-keeps-dialects-separate.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-keeps-dialects-separate.toolproof.yml
@@ -23,15 +23,15 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/pagefind/wasm.pt-pt.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: I run "ls -lh public/pagefind/wasm.pt-br.pagefind"
-    notes: 'TODO: Build a file existence check into toolproof'
+    notes: "TODO: Build a file existence check into toolproof"
   - step: The file "public/pagefind/pagefind-entry.json" should contain "pt-pt"
   - step: The file "public/pagefind/pagefind-entry.json" should contain "pt-br"
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/multilingual/pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml
index 0ec0fa29..16e7a33b 100644
--- a/pagefind/integration_tests/multilingual/pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-merges-omitted-languages-into-the-primary-language.toolproof.yml
@@ -23,7 +23,7 @@ steps:
               <p>I am a mystery document</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/multilingual/pagefind-searches-for-english-with-english-stemming.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-searches-for-english-with-english-stemming.toolproof.yml
index af7148df..95a26e06 100644
--- a/pagefind/integration_tests/multilingual/pagefind-searches-for-english-with-english-stemming.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-searches-for-english-with-english-stemming.toolproof.yml
@@ -12,7 +12,7 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/multilingual/pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml
index 248f02f5..81b6f4e2 100644
--- a/pagefind/integration_tests/multilingual/pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-searches-for-portuguese-with-portuguese-stemming.toolproof.yml
@@ -12,7 +12,7 @@ steps:
               <p data-result>Nothing</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/multilingual/pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml b/pagefind/integration_tests/multilingual/pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml
index 9caf76c9..b064e16f 100644
--- a/pagefind/integration_tests/multilingual/pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml
+++ b/pagefind/integration_tests/multilingual/pagefind-searches-for-unknown-languages-with-no-stemming.toolproof.yml
@@ -23,7 +23,7 @@ steps:
               <p>I am a documentation</p>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-discrete-domains.toolproof.yml b/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-discrete-domains.toolproof.yml
index ee608ecb..004e6f69 100644
--- a/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-discrete-domains.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-discrete-domains.toolproof.yml
@@ -4,7 +4,7 @@ type: reference
 name: Multisite Search > Pagefind can search across discrete domains
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-multiple-basic-sites.toolproof.yml b/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-multiple-basic-sites.toolproof.yml
index e74e0c20..d65aab23 100644
--- a/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-multiple-basic-sites.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_base/pagefind-can-search-across-multiple-basic-sites.toolproof.yml
@@ -1,10 +1,10 @@
 name: Multisite Search > Pagefind can search across multiple basic sites
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-discrete-domains.toolproof.yml b/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-discrete-domains.toolproof.yml
index 240b98e4..47748a81 100644
--- a/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-discrete-domains.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-discrete-domains.toolproof.yml
@@ -8,7 +8,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><div id="search"></div>
       <script src="/website_a/pagefind/pagefind-ui.js"></script></body></html>
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-multiple-sites.toolproof.yml b/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-multiple-sites.toolproof.yml
index 97f18fae..71c7f7d1 100644
--- a/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-multiple-sites.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_base/pagefind-ui-can-search-across-multiple-sites.toolproof.yml
@@ -5,10 +5,10 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><div id="search"></div>
       <script src="/website_a/pagefind/pagefind-ui.js"></script></body></html>
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_filters/background.toolproof.yml b/pagefind/integration_tests/multisite/multisite_filters/background.toolproof.yml
index f929f31f..8e3eaea9 100644
--- a/pagefind/integration_tests/multisite/multisite_filters/background.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_filters/background.toolproof.yml
@@ -15,10 +15,10 @@ steps:
       <!DOCTYPE html><html lang="en"><head></head><body><h1>web ipsum</h1>
       <span data-pagefind-filter="fruit">banana</span>
       <span data-pagefind-filter="emote">happy</span></body></html>
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_lang/language-of-merged-indexes-can-be-selected.toolproof.yml b/pagefind/integration_tests/multisite/multisite_lang/language-of-merged-indexes-can-be-selected.toolproof.yml
index c67f1b84..23d6e0c8 100644
--- a/pagefind/integration_tests/multisite/multisite_lang/language-of-merged-indexes-can-be-selected.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_lang/language-of-merged-indexes-can-be-selected.toolproof.yml
@@ -1,10 +1,10 @@
 name: Multisite Search Languages > Language of merged indexes can be selected
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_lang/pagefind-picks-the-same-language-across-multiple-sites.toolproof.yml b/pagefind/integration_tests/multisite/multisite_lang/pagefind-picks-the-same-language-across-multiple-sites.toolproof.yml
index c920cfb1..d8d2199b 100644
--- a/pagefind/integration_tests/multisite/multisite_lang/pagefind-picks-the-same-language-across-multiple-sites.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_lang/pagefind-picks-the-same-language-across-multiple-sites.toolproof.yml
@@ -3,10 +3,10 @@ name: >-
   sites
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_sort/multiple-indexes-can-be-weighted-separately.toolproof.yml b/pagefind/integration_tests/multisite/multisite_sort/multiple-indexes-can-be-weighted-separately.toolproof.yml
index 470c3b5f..8dce5978 100644
--- a/pagefind/integration_tests/multisite/multisite_sort/multiple-indexes-can-be-weighted-separately.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_sort/multiple-indexes-can-be-weighted-separately.toolproof.yml
@@ -1,10 +1,10 @@
 name: Multisite Result Scoring > Multiple indexes can be weighted separately
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/multisite/multisite_sort/pages-are-scored-correctly-across-indexes.toolproof.yml b/pagefind/integration_tests/multisite/multisite_sort/pages-are-scored-correctly-across-indexes.toolproof.yml
index 2b88e12f..a8b36a23 100644
--- a/pagefind/integration_tests/multisite/multisite_sort/pages-are-scored-correctly-across-indexes.toolproof.yml
+++ b/pagefind/integration_tests/multisite/multisite_sort/pages-are-scored-correctly-across-indexes.toolproof.yml
@@ -1,10 +1,10 @@
 name: Multisite Result Scoring > Pages are scored correctly across indexes
 steps:
   - ref: ./background.toolproof.yml
-  - step: I run "%pagefind_exec_path% --site root/website_a"
+  - macro: I run Pagefind with "--site root/website_a"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_a/pagefind/pagefind.js" should not be empty
-  - step: I run "%pagefind_exec_path% --site root/website_b"
+  - macro: I run Pagefind with "--site root/website_b"
   - step: stdout should contain "Running Pagefind"
   - step: The file "root/website_b/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "root"
diff --git a/pagefind/integration_tests/node_api/node_base/an-index-is-not-consumed-on-write.toolproof.yml b/pagefind/integration_tests/node_api/node_base/an-index-is-not-consumed-on-write.toolproof.yml
index 5ab98640..94cf7be9 100644
--- a/pagefind/integration_tests/node_api/node_base/an-index-is-not-consumed-on-write.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/an-index-is-not-consumed-on-write.toolproof.yml
@@ -31,9 +31,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: stdout should contain "2 fragment(s)"
   - step: The file "output/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/node_api/node_base/background.toolproof.yml b/pagefind/integration_tests/node_api/node_base/background.toolproof.yml
index 3316a59d..43136145 100644
--- a/pagefind/integration_tests/node_api/node_base/background.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/background.toolproof.yml
@@ -13,6 +13,6 @@ steps:
           "version": "1.0.0",
           "main": "index.js",
           "dependencies": {
-              "pagefind": "file:%repo_wd%/wrappers/node"
+              "pagefind": "file:%toolproof_process_directory%/wrappers/node"
           }
       }
diff --git a/pagefind/integration_tests/node_api/node_base/build-a-blended-index-to-memory-via-the-api.toolproof.yml b/pagefind/integration_tests/node_api/node_base/build-a-blended-index-to-memory-via-the-api.toolproof.yml
index 954f57e2..43e50fc5 100644
--- a/pagefind/integration_tests/node_api/node_base/build-a-blended-index-to-memory-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/build-a-blended-index-to-memory-via-the-api.toolproof.yml
@@ -40,9 +40,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Donezo!"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-disk-via-the-api.toolproof.yml b/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-disk-via-the-api.toolproof.yml
index 0c846287..96a36ef3 100644
--- a/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-disk-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-disk-via-the-api.toolproof.yml
@@ -17,9 +17,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-memory-via-the-api.toolproof.yml b/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-memory-via-the-api.toolproof.yml
index fe223508..f5bd4424 100644
--- a/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-memory-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-to-memory-via-the-api.toolproof.yml
@@ -24,9 +24,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "pagefind_version="
   - step: stdout should contain "JS is at pagefind.js"
   - step: stdout should contain "1 fragment(s)"
diff --git a/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml b/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml
index 94a69458..6e1eab3a 100644
--- a/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml
@@ -20,9 +20,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/node_api/node_base/build-a-true-index-to-disk-via-the-api.toolproof.yml b/pagefind/integration_tests/node_api/node_base/build-a-true-index-to-disk-via-the-api.toolproof.yml
index 2c0dbe4c..53c92951 100644
--- a/pagefind/integration_tests/node_api/node_base/build-a-true-index-to-disk-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/build-a-true-index-to-disk-via-the-api.toolproof.yml
@@ -23,9 +23,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/node_api/node_base/build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml b/pagefind/integration_tests/node_api/node_base/build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml
index 2f9cbbae..260bd43f 100644
--- a/pagefind/integration_tests/node_api/node_base/build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml
@@ -21,9 +21,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: The file "output/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "output"
diff --git a/pagefind/integration_tests/node_api/node_base/close-the-pagefind-backend.toolproof.yml b/pagefind/integration_tests/node_api/node_base/close-the-pagefind-backend.toolproof.yml
index c91c3d30..643c1652 100644
--- a/pagefind/integration_tests/node_api/node_base/close-the-pagefind-backend.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/close-the-pagefind-backend.toolproof.yml
@@ -18,9 +18,7 @@ steps:
            console.log(`After close: ${es.join(',')}`);
        }
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "pagefind.js"
   - step: >-
       stdout should contain "After close: Invalid index, does not yet exist in
diff --git a/pagefind/integration_tests/node_api/node_base/force-language-takes-precedence-over-records.toolproof.yml b/pagefind/integration_tests/node_api/node_base/force-language-takes-precedence-over-records.toolproof.yml
index 7975d4aa..7edde45f 100644
--- a/pagefind/integration_tests/node_api/node_base/force-language-takes-precedence-over-records.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/force-language-takes-precedence-over-records.toolproof.yml
@@ -27,9 +27,7 @@ steps:
       }
 
       run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "✨!"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/node_api/node_base/pagefind-empty-index-returns-assets.toolproof.yml b/pagefind/integration_tests/node_api/node_base/pagefind-empty-index-returns-assets.toolproof.yml
index bbd5616b..3c22aeb2 100644
--- a/pagefind/integration_tests/node_api/node_base/pagefind-empty-index-returns-assets.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/pagefind-empty-index-returns-assets.toolproof.yml
@@ -15,9 +15,7 @@ steps:
            console.log(files.map(f => f.path).join(', '));
        }
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "pagefind.js"
   - step: stdout should contain "pagefind-ui.js"
   - step: stdout should contain "pagefind-ui.css"
diff --git a/pagefind/integration_tests/node_api/node_base/pagefind-error-handling.toolproof.yml b/pagefind/integration_tests/node_api/node_base/pagefind-error-handling.toolproof.yml
index 9d3628a3..2d8f17b8 100644
--- a/pagefind/integration_tests/node_api/node_base/pagefind-error-handling.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/pagefind-error-handling.toolproof.yml
@@ -24,9 +24,7 @@ steps:
            }
        }
        bad();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: 'stdout should contain "invalid type: integer `5`"'
   - step: >-
       stdout should contain "Index has been deleted from the Pagefind service
diff --git a/pagefind/integration_tests/node_api/node_base/pagefind-service-config.toolproof.yml b/pagefind/integration_tests/node_api/node_base/pagefind-service-config.toolproof.yml
index bc2859ec..a097b6f9 100644
--- a/pagefind/integration_tests/node_api/node_base/pagefind-service-config.toolproof.yml
+++ b/pagefind/integration_tests/node_api/node_base/pagefind-service-config.toolproof.yml
@@ -21,9 +21,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/partial_matching/search-will-return-pages-that-match---out-of---words.toolproof.yml b/pagefind/integration_tests/partial_matching/search-will-return-pages-that-match---out-of---words.toolproof.yml
index 18dec2cc..9fb48408 100644
--- a/pagefind/integration_tests/partial_matching/search-will-return-pages-that-match---out-of---words.toolproof.yml
+++ b/pagefind/integration_tests/partial_matching/search-will-return-pages-that-match---out-of---words.toolproof.yml
@@ -8,7 +8,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>hello
       world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/python_api/py-an-index-is-not-consumed-on-write.toolproof.yml b/pagefind/integration_tests/python_api/py-an-index-is-not-consumed-on-write.toolproof.yml
index 289cf689..84434bb9 100644
--- a/pagefind/integration_tests/python_api/py-an-index-is-not-consumed-on-write.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-an-index-is-not-consumed-on-write.toolproof.yml
@@ -12,7 +12,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -51,7 +51,7 @@ steps:
 
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Finished"
   - step: stdout should contain "2 fragment(s)"
   - step: The file "output/pagefind/pagefind.js" should not be empty
diff --git a/pagefind/integration_tests/python_api/py-build-a-blended-index-to-memory-via-the-api.toolproof.yml b/pagefind/integration_tests/python_api/py-build-a-blended-index-to-memory-via-the-api.toolproof.yml
index 43798e2a..e52dfc87 100644
--- a/pagefind/integration_tests/python_api/py-build-a-blended-index-to-memory-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-build-a-blended-index-to-memory-via-the-api.toolproof.yml
@@ -14,7 +14,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -48,7 +48,7 @@ steps:
 
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Donezo!"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-disk-via-the-api.toolproof.yml b/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-disk-via-the-api.toolproof.yml
index 3f0f78d3..93baf1b6 100644
--- a/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-disk-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-disk-via-the-api.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -26,7 +26,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-memory-via-the-api.toolproof.yml b/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-memory-via-the-api.toolproof.yml
index 45bc9441..4ebd80fe 100644
--- a/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-memory-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-build-a-synthetic-index-to-memory-via-the-api.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -35,7 +35,7 @@ steps:
 
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "."
   - step: stdout should contain "pagefind_version="
   - step: stdout should contain "JS is at pagefind.js"
   - step: stdout should contain "1 fragment(s)"
diff --git a/pagefind/integration_tests/python_api/py-build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml b/pagefind/integration_tests/python_api/py-build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml
index 6e815be7..f231bc9d 100644
--- a/pagefind/integration_tests/python_api/py-build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-build-a-synthetic-index-with-overridden-urls-to-disk-via-the-api.toolproof.yml
@@ -9,7 +9,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -27,7 +27,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/python_api/py-build-a-true-index-to-disk-via-the-api.toolproof.yml b/pagefind/integration_tests/python_api/py-build-a-true-index-to-disk-via-the-api.toolproof.yml
index 850f7e83..3188628e 100644
--- a/pagefind/integration_tests/python_api/py-build-a-true-index-to-disk-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-build-a-true-index-to-disk-via-the-api.toolproof.yml
@@ -14,7 +14,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -31,7 +31,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/python_api/py-build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml b/pagefind/integration_tests/python_api/py-build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml
index 14cec42c..14ed06d6 100644
--- a/pagefind/integration_tests/python_api/py-build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-build-an-index-to-a-custom-disk-location-via-the-api.toolproof.yml
@@ -12,7 +12,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -34,7 +34,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: The file "output/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "output"
diff --git a/pagefind/integration_tests/python_api/py-close-the-pagefind-backend.toolproof.yml b/pagefind/integration_tests/python_api/py-close-the-pagefind-backend.toolproof.yml
index 8eba935f..7320f901 100644
--- a/pagefind/integration_tests/python_api/py-close-the-pagefind-backend.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-close-the-pagefind-backend.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -32,7 +32,7 @@ steps:
 
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "pagefind.js"
   - step: stdout should contain "pagefind-ui.js"
   - step: stdout should contain "errored getting files after close"
diff --git a/pagefind/integration_tests/python_api/py-force-language-takes-precedence-over-records.toolproof.yml b/pagefind/integration_tests/python_api/py-force-language-takes-precedence-over-records.toolproof.yml
index 1c966ee1..a7ba7880 100644
--- a/pagefind/integration_tests/python_api/py-force-language-takes-precedence-over-records.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-force-language-takes-precedence-over-records.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -34,7 +34,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I run "ls -lh public/pagefind/wasm.unknown.pagefind"
diff --git a/pagefind/integration_tests/python_api/py-pagefind-empty-index-returns-assets.toolproof.yml b/pagefind/integration_tests/python_api/py-pagefind-empty-index-returns-assets.toolproof.yml
index 3f067e37..87bacff4 100644
--- a/pagefind/integration_tests/python_api/py-pagefind-empty-index-returns-assets.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-pagefind-empty-index-returns-assets.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -28,7 +28,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: stdout should contain "pagefind.js"
   - step: stdout should contain "pagefind-ui.js"
diff --git a/pagefind/integration_tests/python_api/py-pagefind-error-handling.toolproof.yml b/pagefind/integration_tests/python_api/py-pagefind-error-handling.toolproof.yml
index 49c11d48..65dda7ed 100644
--- a/pagefind/integration_tests/python_api/py-pagefind-error-handling.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-pagefind-error-handling.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -33,6 +33,6 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: 'stdout should contain "invalid type: integer `5`"'
   - step: stdout should contain "Index deleted"
diff --git a/pagefind/integration_tests/python_api/py-pagefind-service-config.toolproof.yml b/pagefind/integration_tests/python_api/py-pagefind-service-config.toolproof.yml
index d8314e7f..3d19016a 100644
--- a/pagefind/integration_tests/python_api/py-pagefind-service-config.toolproof.yml
+++ b/pagefind/integration_tests/python_api/py-pagefind-service-config.toolproof.yml
@@ -8,7 +8,7 @@ steps:
   - step: I have a "public/run.py" file with the content {python}
     python: |2-
       import sys
-      sys.path.append('%repo_wd%/wrappers/python/src')
+      sys.path.append('%toolproof_process_directory%/wrappers/python/src')
 
       import asyncio
       import json
@@ -31,7 +31,7 @@ steps:
         print("Complete")
       if __name__ == "__main__":
         asyncio.run(main())
-  - step: I run "cd public && PAGEFIND_BINARY_PATH=%pagefind_exec_path% python3 run.py"
+  - macro: I run Pagefind Python as "run.py" in "public"
   - step: stdout should contain "Complete"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/sanity/cli-tests-are-working.toolproof.yml b/pagefind/integration_tests/sanity/cli-tests-are-working.toolproof.yml
index bf41224e..816879f3 100644
--- a/pagefind/integration_tests/sanity/cli-tests-are-working.toolproof.yml
+++ b/pagefind/integration_tests/sanity/cli-tests-are-working.toolproof.yml
@@ -2,5 +2,5 @@ name: Sanity Tests > CLI tests are working
 steps:
   - step: I have a "public/index.html" file with the content {html}
     html: <!DOCTYPE html><html lang="en"><head></head><body><p>a</p></body></html>
-  - step: I run "%pagefind_exec_path% --site public"
+  - macro: I run Pagefind with "--site public"
   - step: stdout should contain "Running Pagefind"
diff --git a/pagefind/integration_tests/scoring_custom/page-length-ranking-can-be-configured.toolproof.yml b/pagefind/integration_tests/scoring_custom/page-length-ranking-can-be-configured.toolproof.yml
index 3173c2c1..2456ea32 100644
--- a/pagefind/integration_tests/scoring_custom/page-length-ranking-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/scoring_custom/page-length-ranking-can-be-configured.toolproof.yml
@@ -29,7 +29,7 @@ steps:
       terracotta page.</p>
 
       <p>Sed posuere consectetur est at lobortis.</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/scoring_custom/term-frequency-vs-raw-count-can-be-configured.toolproof.yml b/pagefind/integration_tests/scoring_custom/term-frequency-vs-raw-count-can-be-configured.toolproof.yml
index ae453ad3..9bb5177e 100644
--- a/pagefind/integration_tests/scoring_custom/term-frequency-vs-raw-count-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/scoring_custom/term-frequency-vs-raw-count-can-be-configured.toolproof.yml
@@ -27,7 +27,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>This is a shorter
       terracotta page.</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/scoring_custom/term-saturation-can-be-configured.toolproof.yml b/pagefind/integration_tests/scoring_custom/term-saturation-can-be-configured.toolproof.yml
index 2ad7d52b..e6d4f590 100644
--- a/pagefind/integration_tests/scoring_custom/term-saturation-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/scoring_custom/term-saturation-can-be-configured.toolproof.yml
@@ -11,7 +11,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>post</h1>
       <p>common and common and unrelated and unrelated</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/scoring_custom/term-similarity-ranking-can-be-configured.toolproof.yml b/pagefind/integration_tests/scoring_custom/term-similarity-ranking-can-be-configured.toolproof.yml
index 21c50bb7..93a64370 100644
--- a/pagefind/integration_tests/scoring_custom/term-similarity-ranking-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/scoring_custom/term-similarity-ranking-can-be-configured.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>This post talks about
       abcdefghijklmnopqrstuv — twice! abcdefghijklmnopqrstuv</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/scoring_defaults/background.toolproof.yml b/pagefind/integration_tests/scoring_defaults/background.toolproof.yml
index 08c70f42..47da42cb 100644
--- a/pagefind/integration_tests/scoring_defaults/background.toolproof.yml
+++ b/pagefind/integration_tests/scoring_defaults/background.toolproof.yml
@@ -16,7 +16,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>A post about dogs vs
       cats (but mainly dogs)</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/search_options/base-url-auto-detects-the-default-directory-being-moved.toolproof.yml b/pagefind/integration_tests/search_options/base-url-auto-detects-the-default-directory-being-moved.toolproof.yml
index 8bb67b68..e5159d3f 100644
--- a/pagefind/integration_tests/search_options/base-url-auto-detects-the-default-directory-being-moved.toolproof.yml
+++ b/pagefind/integration_tests/search_options/base-url-auto-detects-the-default-directory-being-moved.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path% --output-subdir blog/pagefind"
+  - macro: I run Pagefind with "--output-subdir blog/pagefind"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/blog/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/search_options/base-url-can-be-configured.toolproof.yml b/pagefind/integration_tests/search_options/base-url-can-be-configured.toolproof.yml
index 28f859f0..c83fbd78 100644
--- a/pagefind/integration_tests/search_options/base-url-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/search_options/base-url-can-be-configured.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/search_options/keep-index-url-can-be-configured.toolproof.yml b/pagefind/integration_tests/search_options/keep-index-url-can-be-configured.toolproof.yml
index 200a46af..bb7bb9a2 100644
--- a/pagefind/integration_tests/search_options/keep-index-url-can-be-configured.toolproof.yml
+++ b/pagefind/integration_tests/search_options/keep-index-url-can-be-configured.toolproof.yml
@@ -9,9 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: >-
-      I run "%pagefind_exec_path% --output-subdir blog/pagefind
-      --keep-index-url"
+  - macro: I run Pagefind with "--output-subdir blog/pagefind --keep-index-url"
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/blog/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/sentences/pagefind-doesn-t-join-inline-elements-as-sentences.toolproof.yml b/pagefind/integration_tests/sentences/pagefind-doesn-t-join-inline-elements-as-sentences.toolproof.yml
index d9e68001..7461f136 100644
--- a/pagefind/integration_tests/sentences/pagefind-doesn-t-join-inline-elements-as-sentences.toolproof.yml
+++ b/pagefind/integration_tests/sentences/pagefind-doesn-t-join-inline-elements-as-sentences.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><span>Hello</span><span>World</span></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/sentences/pagefind-ignores-redundant-zero-width-spaces.toolproof.yml b/pagefind/integration_tests/sentences/pagefind-ignores-redundant-zero-width-spaces.toolproof.yml
index 578f6f74..a8f27609 100644
--- a/pagefind/integration_tests/sentences/pagefind-ignores-redundant-zero-width-spaces.toolproof.yml
+++ b/pagefind/integration_tests/sentences/pagefind-ignores-redundant-zero-width-spaces.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>Hello &#x200B;
       World</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/sentences/pagefind-joins-block-elements-as-sentences.toolproof.yml b/pagefind/integration_tests/sentences/pagefind-joins-block-elements-as-sentences.toolproof.yml
index 45f51fd1..6605d4a7 100644
--- a/pagefind/integration_tests/sentences/pagefind-joins-block-elements-as-sentences.toolproof.yml
+++ b/pagefind/integration_tests/sentences/pagefind-joins-block-elements-as-sentences.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><p>Hello</p><p>World</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/sentences/pagefind-treats-br-tags-as-spaces.toolproof.yml b/pagefind/integration_tests/sentences/pagefind-treats-br-tags-as-spaces.toolproof.yml
index 40ff4004..1f156547 100644
--- a/pagefind/integration_tests/sentences/pagefind-treats-br-tags-as-spaces.toolproof.yml
+++ b/pagefind/integration_tests/sentences/pagefind-treats-br-tags-as-spaces.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><p>Hello<br/>World</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/sorting/background.toolproof.yml b/pagefind/integration_tests/sorting/background.toolproof.yml
index d5df66f1..f5d21a38 100644
--- a/pagefind/integration_tests/sorting/background.toolproof.yml
+++ b/pagefind/integration_tests/sorting/background.toolproof.yml
@@ -40,7 +40,7 @@ steps:
       <i data-pagefind-sort="weight:1234.5678"></i>
 
       <b data-pagefind-sort="mixed">10</b></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/stemming/search-is-case-independent.toolproof.yml b/pagefind/integration_tests/stemming/search-is-case-independent.toolproof.yml
index f242da54..db34cf9b 100644
--- a/pagefind/integration_tests/stemming/search-is-case-independent.toolproof.yml
+++ b/pagefind/integration_tests/stemming/search-is-case-independent.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>the cat is
       Meowing</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/stemming/search-is-punctuation-independent.toolproof.yml b/pagefind/integration_tests/stemming/search-is-punctuation-independent.toolproof.yml
index 39162434..638f3b6c 100644
--- a/pagefind/integration_tests/stemming/search-is-punctuation-independent.toolproof.yml
+++ b/pagefind/integration_tests/stemming/search-is-punctuation-independent.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>My laptop doesn't
       have a USB-A port</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/stemming/searching-for-a-word-will-match-against-the-stem-of-that-word.toolproof.yml b/pagefind/integration_tests/stemming/searching-for-a-word-will-match-against-the-stem-of-that-word.toolproof.yml
index 93004fe9..280ff0b1 100644
--- a/pagefind/integration_tests/stemming/searching-for-a-word-will-match-against-the-stem-of-that-word.toolproof.yml
+++ b/pagefind/integration_tests/stemming/searching-for-a-word-will-match-against-the-stem-of-that-word.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>the cat is
       meowing</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-prefix.toolproof.yml b/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-prefix.toolproof.yml
index 8309de56..d2ee3045 100644
--- a/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-prefix.toolproof.yml
+++ b/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-prefix.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>a doc about
       installation</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-stem.toolproof.yml b/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-stem.toolproof.yml
index 36c8e03f..0f2a5cc1 100644
--- a/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-stem.toolproof.yml
+++ b/pagefind/integration_tests/stemming/searching-will-backtrack-a-word-to-find-a-stem.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>a doc about
       installation</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/suggestions/search-results-will-be-returned-for-all-extensions-of-the-word.toolproof.yml b/pagefind/integration_tests/suggestions/search-results-will-be-returned-for-all-extensions-of-the-word.toolproof.yml
index c01bccdb..a024fd25 100644
--- a/pagefind/integration_tests/suggestions/search-results-will-be-returned-for-all-extensions-of-the-word.toolproof.yml
+++ b/pagefind/integration_tests/suggestions/search-results-will-be-returned-for-all-extensions-of-the-word.toolproof.yml
@@ -9,7 +9,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>Hello
       Wow</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_base/pagefind-ui-can-programmatically-filter.toolproof.yml b/pagefind/integration_tests/ui/ui_base/pagefind-ui-can-programmatically-filter.toolproof.yml
index df3c07cc..6d3204ba 100644
--- a/pagefind/integration_tests/ui/ui_base/pagefind-ui-can-programmatically-filter.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_base/pagefind-ui-can-programmatically-filter.toolproof.yml
@@ -13,7 +13,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><h1
       data-pagefind-filter="bucket:b">title res two</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_base/pagefind-ui-loads.toolproof.yml b/pagefind/integration_tests/ui/ui_base/pagefind-ui-loads.toolproof.yml
index 096620a6..5795f963 100644
--- a/pagefind/integration_tests/ui/ui_base/pagefind-ui-loads.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_base/pagefind-ui-loads.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_base/pagefind-ui-searches.toolproof.yml b/pagefind/integration_tests/ui/ui_base/pagefind-ui-searches.toolproof.yml
index 54041037..7fc233dc 100644
--- a/pagefind/integration_tests/ui/ui_base/pagefind-ui-searches.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_base/pagefind-ui-searches.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html
       lang="en"><head></head><body><h1>world</h1></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-adds-highlight-query-params.toolproof.yml b/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-adds-highlight-query-params.toolproof.yml
index 3829fbb6..921190c3 100644
--- a/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-adds-highlight-query-params.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-adds-highlight-query-params.toolproof.yml
@@ -14,7 +14,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>hello world</h1>
       <p>Hello world! How are you</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-does-not-add-highlight-query-params-by-default.toolproof.yml b/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-does-not-add-highlight-query-params-by-default.toolproof.yml
index 09abb551..d8d43286 100644
--- a/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-does-not-add-highlight-query-params-by-default.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-does-not-add-highlight-query-params-by-default.toolproof.yml
@@ -14,7 +14,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>hello world</h1>
       <p>Hello world! How are you</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-uses-custom-highlight-query-param-name.toolproof.yml b/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-uses-custom-highlight-query-param-name.toolproof.yml
index 42c7cb79..18634587 100644
--- a/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-uses-custom-highlight-query-param-name.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_highlight/pagefind-ui-uses-custom-highlight-query-param-name.toolproof.yml
@@ -14,7 +14,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h1>hello world</h1>
       <p>Hello world! How are you</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-results.toolproof.yml b/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-results.toolproof.yml
index d3a29062..762d11c9 100644
--- a/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-results.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-results.toolproof.yml
@@ -17,7 +17,7 @@ steps:
               }
           });
       </script></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-search-terms.toolproof.yml b/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-search-terms.toolproof.yml
index 4cf4ff27..8a0c2bd7 100644
--- a/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-search-terms.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_hooks/pagefind-ui-can-provide-a-hook-to-process-search-terms.toolproof.yml
@@ -13,7 +13,7 @@ steps:
               processTerm: (t) => t.replace("word", "search")
           });
       </script></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_scoring/pagefind-ui-can-customize-scoring.toolproof.yml b/pagefind/integration_tests/ui/ui_scoring/pagefind-ui-can-customize-scoring.toolproof.yml
index d1ebc50b..503881bc 100644
--- a/pagefind/integration_tests/ui/ui_scoring/pagefind-ui-can-customize-scoring.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_scoring/pagefind-ui-can-customize-scoring.toolproof.yml
@@ -48,7 +48,7 @@ steps:
               element: "#search"
           });
       </script></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_strings/pagefind-ui-can-load-custom-translations.toolproof.yml b/pagefind/integration_tests/ui/ui_strings/pagefind-ui-can-load-custom-translations.toolproof.yml
index 9b1d2b37..3e5d9f9d 100644
--- a/pagefind/integration_tests/ui/ui_strings/pagefind-ui-can-load-custom-translations.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_strings/pagefind-ui-can-load-custom-translations.toolproof.yml
@@ -21,7 +21,7 @@ steps:
               </script>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/ui/ui_strings/pagefind-ui-loads-automatic-translations.toolproof.yml b/pagefind/integration_tests/ui/ui_strings/pagefind-ui-loads-automatic-translations.toolproof.yml
index ca98e175..e530650f 100644
--- a/pagefind/integration_tests/ui/ui_strings/pagefind-ui-loads-automatic-translations.toolproof.yml
+++ b/pagefind/integration_tests/ui/ui_strings/pagefind-ui-loads-automatic-translations.toolproof.yml
@@ -16,7 +16,7 @@ steps:
               </script>
           </body>
       </html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/urls/background.toolproof.yml b/pagefind/integration_tests/urls/background.toolproof.yml
index 383a450a..7736c09b 100644
--- a/pagefind/integration_tests/urls/background.toolproof.yml
+++ b/pagefind/integration_tests/urls/background.toolproof.yml
@@ -14,6 +14,6 @@ steps:
           "version": "1.0.0",
           "main": "index.js",
           "dependencies": {
-              "pagefind": "file:%repo_wd%/wrappers/node"
+              "pagefind": "file:%toolproof_process_directory%/wrappers/node"
           }
       }
diff --git a/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml b/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml
index 63e06ba8..d4eb6b55 100644
--- a/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml
+++ b/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml
@@ -17,9 +17,7 @@ steps:
        }
 
        run();
-  - step: >-
-      I run "cd public && npm i && PAGEFIND_BINARY_PATH=%pagefind_exec_path%
-      node index.js"
+  - macro: I run Pagefind Node as "index.js" in "public"
   - step: stdout should contain "Successfully wrote files"
   - step: The file "public/pagefind/pagefind.js" should not be empty
   - step: I serve the directory "public"
diff --git a/pagefind/integration_tests/weighting/compound-words-are-implicitly-weighted-lower.toolproof.yml b/pagefind/integration_tests/weighting/compound-words-are-implicitly-weighted-lower.toolproof.yml
index 782e2f13..8623139c 100644
--- a/pagefind/integration_tests/weighting/compound-words-are-implicitly-weighted-lower.toolproof.yml
+++ b/pagefind/integration_tests/weighting/compound-words-are-implicitly-weighted-lower.toolproof.yml
@@ -13,7 +13,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>A single reference to
       the TwoAntelope</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/weighting/compound-words-matched-as-full-words-use-the-full-weight.toolproof.yml b/pagefind/integration_tests/weighting/compound-words-matched-as-full-words-use-the-full-weight.toolproof.yml
index f4d0fdb4..6feca42f 100644
--- a/pagefind/integration_tests/weighting/compound-words-matched-as-full-words-use-the-full-weight.toolproof.yml
+++ b/pagefind/integration_tests/weighting/compound-words-matched-as-full-words-use-the-full-weight.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>A single reference to
       ThreeAntelopes</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/weighting/compound-words-prefixes-prioritise-the-lower-weight.toolproof.yml b/pagefind/integration_tests/weighting/compound-words-prefixes-prioritise-the-lower-weight.toolproof.yml
index 587363af..907a6ddb 100644
--- a/pagefind/integration_tests/weighting/compound-words-prefixes-prioritise-the-lower-weight.toolproof.yml
+++ b/pagefind/integration_tests/weighting/compound-words-prefixes-prioritise-the-lower-weight.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>A single reference to
       ThreeAntelopes</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/weighting/compound-words-sum-to-a-full-weight.toolproof.yml b/pagefind/integration_tests/weighting/compound-words-sum-to-a-full-weight.toolproof.yml
index 9454ff7b..7c4a6be6 100644
--- a/pagefind/integration_tests/weighting/compound-words-sum-to-a-full-weight.toolproof.yml
+++ b/pagefind/integration_tests/weighting/compound-words-sum-to-a-full-weight.toolproof.yml
@@ -5,7 +5,7 @@ steps:
     html: >-
       <!DOCTYPE html><html lang="en"><head></head><body><p>A single reference to
       ThreeAntelopes</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/weighting/headings-are-automatically-favoured-over-standard-text.toolproof.yml b/pagefind/integration_tests/weighting/headings-are-automatically-favoured-over-standard-text.toolproof.yml
index a13c3705..99e585af 100644
--- a/pagefind/integration_tests/weighting/headings-are-automatically-favoured-over-standard-text.toolproof.yml
+++ b/pagefind/integration_tests/weighting/headings-are-automatically-favoured-over-standard-text.toolproof.yml
@@ -24,7 +24,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><h3>Antelope</h3>
       <p>Other antelope antelope text, of a similar length</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-higher.toolproof.yml b/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-higher.toolproof.yml
index d32dabd1..135c3002 100644
--- a/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-higher.toolproof.yml
+++ b/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-higher.toolproof.yml
@@ -19,7 +19,7 @@ steps:
     html: |-
       <!DOCTYPE html><html lang="en"><head></head><body><p>Antelope</p>
       <p>Antelope Antelope Antelope Antelope</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-lower.toolproof.yml b/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-lower.toolproof.yml
index c5375c55..61822dc0 100644
--- a/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-lower.toolproof.yml
+++ b/pagefind/integration_tests/weighting/text-can-be-explicitly-weighted-lower.toolproof.yml
@@ -13,7 +13,7 @@ steps:
       aren't related</p>
 
       <p>One solitary mention of antelope</p></body></html>
-  - step: I run "%pagefind_exec_path%"
+  - macro: I run Pagefind
   - step: stdout should contain "Running Pagefind"
   - step: I serve the directory "public"
   - step: In my browser, I load "/"
diff --git a/test_ci.sh b/test_ci.sh
deleted file mode 100755
index f16b819c..00000000
--- a/test_ci.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd "$SCRIPT_DIR"
-
-PAGEFIND=$(realpath "$SCRIPT_DIR/target/$1/pagefind")
-REPO_WD=$(realpath "$SCRIPT_DIR")
-
-npx -y toolproof@0.4.1 --placeholders pagefind_exec_path="$PAGEFIND" repo_wd="$REPO_WD" -c 1
diff --git a/test_interactive.sh b/test_interactive.sh
deleted file mode 100755
index 26aee2a7..00000000
--- a/test_interactive.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-cd $SCRIPT_DIR
-
-cd pagefind
-cargo build --release --features extended
-cd $SCRIPT_DIR
-
-PAGEFIND=$(realpath "$SCRIPT_DIR/target/release/pagefind")
-REPO_WD=$(realpath "$SCRIPT_DIR")
-
-npx -y toolproof@0.4.1 --placeholders pagefind_exec_path="$PAGEFIND" repo_wd="$REPO_WD" -c 4 -i
diff --git a/toolproof.yml b/toolproof.yml
new file mode 100644
index 00000000..21163470
--- /dev/null
+++ b/toolproof.yml
@@ -0,0 +1,10 @@
+# Run Toolproof tests from the root of the repo with `npx toolproof@latest`
+
+browser: chrome
+concurrency: 4
+timeout: 20
+browser_timeout: 16
+before_all:
+  - command: cd pagefind && cargo build --release --features extended
+placeholders:
+  pagefind_mode: release

From 83aee8df7fca7f8425bf77934bba160650e30d28 Mon Sep 17 00:00:00 2001
From: Liam Bigelow <40188355+bglw@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:19:00 +1300
Subject: [PATCH 2/3] Restore test non-concurrency in CI, omit a node test from
 Windows

---
 .github/workflows/release.yml                                  | 2 +-
 .github/workflows/test.yml                                     | 2 +-
 .../urls/tag-pages-as-external-urls.toolproof.yml              | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 94db97fe..6a6140fd 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -537,7 +537,7 @@ jobs:
 
       - name: Test CLI
         if: matrix.run_tests == true
-        run: npx -y toolproof@latest -s --placeholders pagefind_mode="${{ matrix.target }}/release"
+        run: npx -y toolproof@latest -s -c 1 --placeholders pagefind_mode="${{ matrix.target }}/release"
 
       - name: Move extended binary aside
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6b6967ab..ef8324cb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -117,7 +117,7 @@ jobs:
         run: cargo test --release --lib --features extended
 
       - name: Test CLI
-        run: npx -y toolproof@latest -s
+        run: npx -y toolproof@latest -s -c 1
 
       - name: Set up poetry
         run: ./wrappers/python/scripts/ci/github/setup_poetry.sh
diff --git a/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml b/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml
index d4eb6b55..0db054bd 100644
--- a/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml
+++ b/pagefind/integration_tests/urls/tag-pages-as-external-urls.toolproof.yml
@@ -1,4 +1,7 @@
 name: URL tests > Tag pages as external URLs
+platforms:
+  - linux
+  - mac
 steps:
   - ref: ./background.toolproof.yml
   - step: I have a "public/index.js" file with the content {js}

From 3a376b24332fa598f663574957d95152ebfa35fb Mon Sep 17 00:00:00 2001
From: Liam Bigelow <40188355+bglw@users.noreply.github.com>
Date: Tue, 17 Dec 2024 15:49:42 +1300
Subject: [PATCH 3/3] Longer step timeouts on CI

---
 .github/workflows/release.yml | 2 +-
 .github/workflows/test.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6a6140fd..b93d80c7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -537,7 +537,7 @@ jobs:
 
       - name: Test CLI
         if: matrix.run_tests == true
-        run: npx -y toolproof@latest -s -c 1 --placeholders pagefind_mode="${{ matrix.target }}/release"
+        run: npx -y toolproof@latest -s -c 1 --timeout 45 --placeholders pagefind_mode="${{ matrix.target }}/release"
 
       - name: Move extended binary aside
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index ef8324cb..635e6bbf 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -117,7 +117,7 @@ jobs:
         run: cargo test --release --lib --features extended
 
       - name: Test CLI
-        run: npx -y toolproof@latest -s -c 1
+        run: npx -y toolproof@latest -s -c 1 --timeout 45
 
       - name: Set up poetry
         run: ./wrappers/python/scripts/ci/github/setup_poetry.sh