updated tests, updated importer