FactoryGirl vs. Factory for compatibility with different ruby versions
Fixes to update the content.