Making only tests marked with @mail use the mailer. Fixing bugs.