Added some needed tests for the case of email messaging delivery, hooooo!