Fixed failing custom_organizations tests