Tidy up tests CSV file, make column headers more explicit