Added tests for CSVParser. Fixed CSVParser