Improve testing for -csv