Fix csv tests to match current API
More test fixes to match API