Minor refactor of MetadataImportTest factory
Change simple metadata import test into entityType metadata import test
wip