adapted test to new testdata
removed old testfile, adapted tests