Added MailTestVerifier and event handling