Fix tests from CSVReader