Fixed unit tests

* changed tests to use subset of sampledata
* some fixes to unit tests themselves. 

* problem: npm test stopped working for me, is it only me? Will look into it later.
Renamed sampledata2 to sampledata