PS: I've pushed the refactoring into a vitest test on master (18.10.0RC1) and not on the 18.9.x branch as it doesn't contain the vitest setup.