[taco_emoji]

You could just use nested classes for that, with the added benefit that the test framework will reflect that organization in its UX.

[DAllison]

The suggestion is appreciated. Thank you.

I have a minor doubt that I won't like the additional level of nesting incurred, but I'll attempt it regardless.