Merge "Make smtp tests more robust"