Stop using factories for Metadata import test and extend EntityType test