more test code (and recommit of changes from last week that new machine doesn't remember!)
Merge branch 'feature/sprint30-misc' of https://github.com/SalesforceFoundation/Cumulus into feature/sprint30-misc