1) Improved CSV handling.
2) Updated tests to handle changes.