Split out role handling
Split out affiliation tests