Adjustments for email test