Merge pull request #6833 from eileenmcnaughton/email-test-fix