adapt test-orgs to new elements fundingAgency + subSector