Refactored to use the new CSV functionality

I also removed the temporal .raw tests that I created before.