Small test fixes
Setting a better From: email address