CRM-12490 - test fixes