Messages are hard...

...but seriously this is a various range of fixes and test additions.