Adjust the test suite to account for recent changes related to #2822. Most changes are related to English language error messages only. (CVS 4622)

FossilOrigin-Name: 2f88b9b3e3c9abc3ae4a5dcef82707dd74f8aace