Update the tests to allow for the new CSV format