Add test for CSV writer too