Fixed tests that failed because of changes to the error messages