Fix up smtp tests