Remove some repeated code for defining traits for each record
Fix City & CityISPOrg - both needed the Role::HasSubdivisions role

Also added tests for these classes.