Fixed some Importer tests and cleaned code.