Bug 956787 - Merge the email tests where we can