CRM-15203 fix enotice to make test setup work
CRM-15203 further test oriented fixes