salvaged test changes
94 percent green
wrote mailer tests
fixed merge conflicts