Merge pull request #1328 from eileenmcnaughton/master

Test improvements, minor fix on mailing API  (Closes CRM-13512)
test fixup- changed fn signature doesn't expect 'NULL'