Fixed failing Org tests

Please review it 
Thanks