Cleaned up Generic Mailer, added test case