wip
fix merge conflict
[importer] Allow running unit and acceptance tests separately