added testdata, renamed files, remove console logging