Fixed up testGetCampus
resolved conflicts
resolved conflicts