Test for CSV parser and moving classes around a bit.