Renaming non-public functions and methods accordingly, no need for
custom class test predicates because the defaults work fine.