Additional changes to csv cleanup and some more rspec tests