Fixed up org tests