Merge pull request #513 from dlobo/master

Get CRM tests working with activity changes