Fix tests to support correctly unit.
Merge pull request #3244 from jburel/importer-test

import tests