Mailer testing first steps
bodyArray to body
Mailer class now covered
Merge remote-tracking branch 'remotes/upstream/develop' into develop