Added tests for MailServer
A couple more TODO items