Fixing mail tests