Separate out cohorted test classes