add factorygirl and refactor specs
add factory girl and refactor specs