use factory girl
merge pull request
Merge branch 'johanness-master'