#987 Email: Update and create new tests.