Add and improve existing tests for the importer

#4218