A lot of CSV fixes and tests added