Revert revisions 57472, 57474, and 57477 which disabled some tests
when the email package was removed.  Email was restored, so restore the tests.
4 files changed