Adjust some overly-specific error messages in test cases.