Adop FactoryService tests