testdata fixed
some cleaning