#220 Send test email & verification email improvements