Simplify csv_helper and integration tests