Email test failures

Because of the changes made in #2098, the email tests are now failing and should be fixed up.

https://github.com/oaeproject/Hilary/compare/2024f8d634d3...ded4200c1d82