Add new tests for Emails. #600