Improve logic for cohort visibility labels

TNL-25
This shouldn't need to inherit from another mixin that declares a whole bunch of tests that are unrelated to cohorting.