Updated testing, added SMTP support