Fix CSV syntax

Some rows contain commas, which are interpreted as another column in the CSV.

I've added a test for the CSV but I'm not sure it's in the right place. Suggestions welcome.