CRM-13294 - extra fix + test fix