Update tests to reflect the new error messages.
Oh, it helps to also commit the change that improves the error messages.
Merge remote-tracking branch 'origin/master' into set-serialization