Fix tests that break bc of changed messages