Draft delegating CSV output to OGR

Adapt tests to new output