Improve handling and testing of cohort visibility labels

TNL-25