Move factorygirl config to test env only
Merge branch 'hotfix/deployment'