Fixed recently broken ImportsTest & EFactoryXtextIntegrationTest