FlexibleCriterion and tests now make correct use of CsvHelper
Prior to this, the wrong exceptions were being caught