Added testdata and fixed alot of bugs