CRM-15296 re-enable tests