#50 rewrite tests / prevent exit on sending mail