fixing mailing issues, tests