Small test fixes
Setting a better From: email address
Merge pull request #69 from osantana/master

Small fixes in code and tests