I'll do another PR with some tests to illustrate different scenarios I had in mind when building this (which is quite similar to how old ConventionTests worked).

That should give us a clearer view of what solution would make most sense here