Handle unknown cohort ids plus more tests