revision of importer, and test_importer

importer writes not list to corpus file, instead of dict. now it can
keep corpus order. test_importer leaves not test files behind. test dirs
and files are removed