fix order of csv fields
update tests with correct csv header order