Merge "Make smtp test more robust"