Fixed failing Org tests