Created affiliation classes and changed the controller tests