CRM-12545 fix tests broken by work on activity contact restructuring