I don't see much benefit in grouping the tests in this way. I'll comment in the PR main body.