Adding a few more testdata points. Fixing path stuff from last change.