Added csv parsing and some more tests