Don't fail on empty messages
Fix tests to handle updated message types