Email test tweaks