Removing some more unnecessary manual quotes from diagnostics. Updated the related test case to ensure correctness.