Restructures testGetCampus and am about half way through testIsLegalAction
Resolved conflicts