Updated EmailService Tests