Fixed logger
Fixed mailer + tests