Only declare the set if we need it.
Switch test over to a CSVDiff test.