Fixed EmailSendingTest probably
Could not test yet