Reworking the email test feature.