more fixes for importer tests and some new tests