CRM-12274: Get CRM tests working with activity changes