Unit Test + changes in the CSV parsing