Feature 73 mailer

Minor changes in tests