Added some modifications to the email tests