Fix factory
Add common locale
Fix spec