Minor reformat
Add test case for multiple messages in one file