- hopcsv refactor
- hopcsv refactor2
- tests fixes