fixed failing OrgTests for nightly (headpin and katello )

Please review it