Reduce differences between similar tests.
Remove bit-rot comments.
Simplify code (avoid redundant lookups, ...).
Also, make easier to subclass and use for a different category tree.