test fixes for running when State and Country pick lists are enabled.
Merge branch 'feature/1158-state-country-picklists' of https://github.com/SalesforceFoundation/Cumulus into feature/1158-state-country-picklists