Test fixes related to CRM-13122