Add field for CSV upload and fix tests