Remove ContactFactory. Improve MailerTest