Interop-related tests for #1654.
Fix test for changed error message.