Another fix for sending mails
Fixed tests for sending mails