Derek/mailer tests + filter bug fix