Refactoring Test support to allow for message content read from a file.
Merge branch 'andreas'