Improve tests

Unit test code coverage is currently around 70%, and could do with being improved.

One major aspect of testing is not covered at all - while we're happily generating emails, there are no tests that check whether message content is what it is meant to be at the receiving end. This will require coordination with a local fake mail server (already part of the testing config).