Fix a few more error message expectations