chore: fix bad merge breaking build

[garethbowen]

In the flurry of merges this morning there was one refactor on one PR that broke another. This applies the refactor to the additional test suite.

[changeset-bot]

⚠️ No Changeset found

Latest commit: ee61d40

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR