CRM-13072 upgrade additional test classes