CRM-13072 upgrade additional test classes including fixing activity.type.delete