Started fixing CSV reader tests