moved csv into data directory, added a few tests, tweaked some items
fixed merge conflicts