WIP FactoryGirl
Fix class signature change for core