Fixes #3293 add FactoryGirl to tests
(cherry picked from commit 3035495f1aa94108c7d60610fa53ca6b43bbaa56)
Fixes #3293 add FactoryGirl to tests
(cherry picked from commit 3035495f1aa94108c7d60610fa53ca6b43bbaa56)