Do the correct thing when extending messages
Slightly more robust test suite