Some improvements + First MailChatcher adding tests